Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/EvilHangMan.class
	src/EvilHangMan.java