whoops, mistake in last commit
Merge branch 'master' of https://github.com/JoshMackin/Spoon-Knife

Conflicts:
	HelloCommit.java