Hello class modified
Merge origin/master

Conflicts:
	src/helloworld/Hello.java