commit
Merge branch 'master' of https://github.com/BeyondTheDawn/JavaStudy.git

Conflicts:
	src/HelloWorld.java