Merge branch 'master' of http://gogs.yaoxiangedu.com/huzh/TS

# Conflicts:
#	01.ts

01.ts

@@ -0,0 +1,9 @@
+let x: number = 1;
+let y = false;
+
+function sum(a: number,b: number): number{
+    return a + b;
+}
+
+let m: 10 | 22 | "ee";  //字面量
+let n: number | boolean;  //

part1/01.js

@@ -1,2 +1,5 @@
-var a;
-a = 4;
+var a = 1;
+var b = false;
+function sum(a, b) {
+    return a + b;
+}