Merge branch 'master' of http://yunpi.tpddns.cn:3000/lisl/gitTest.git

Conflicts:
	src/gitTest/Test.java

src/gitTest/Test.java

@@ -4,4 +4,5 @@ public class Test {
 	String assString;
 	String abString;
 	String cString;
+    String dddString;
 }