version_3
Merge branch 'master' of https://github.com/NLPScott/MyProject.git

Conflicts:
	src/com/version/Test.java
添加version1 and version2.java
WYG add
Test4.java add
Merge remote-tracking branch 'origin/master'