commit, but wait to push
Merge branch 'master' of https://github.com/adambarney/TestRepo.git

Conflicts:
	Test/src/HelloWorld.java