HelloJava_1
HelloJava_2
Merge branch 'master' of https://github.com/Novel608/HelloBoy.git

Conflicts:
	src/com/example/test/Test.java