2
1
Merge branch 'master' of https://github.com/yisimple/JavaTest.git

Conflicts:
	JavaTest/src/com/test/java/HelloWorld.java