Added modified "Hello World" program to test branch
Merge branch 'test'

Conflicts:
	HelloWorld/src/HelloWorld.java