jy si pas
Merge branch 'master' of https://github.com/phacks/hangman

Conflicts:
	src/hangman/ConnectionPanel.java
	src/hangman/LogicClient.java