updated HelloWorld.javaa
Merge branch 'master' of https://github.com/mheinrich94/git-test.git

Conflicts:
	git-test/src/helloWorld/HelloWorld.java