I added my name and the messege "How you all doin"
Merge branch 'master' of https://github.com/bploger/Hello-World into bploger-master

Conflicts:
	HelloWorld.java
Merge branch 'bploger-master'