Edit #2 on client.
Merge branch 'master' of https://github.com/mikegrant/HelloWorld.git

Conflicts:
	HelloWorld/src/HelloWorld.java