Test Hello World
Merge branch 'test'

Conflicts:
	HelloWorld.java
Combined Hello World