bum
Merge branch 'master' of https://github.com/Adamduehansen/Hangman

Conflicts:
	src/hangman/Hangman.java