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

Conflicts:
	src/gitTest/Test.java

src/gitTest/Test.java

@@ -1,5 +1,8 @@
 package gitTest;
 
 public class Test {
+	String assString;
+	String abString;
+	String cString;
     String dddString;
 }