I'll kill you... one day... just wait for it...
Merge branch 'master' of https://github.com/FChapeau/TP2_Drouin_Roy

Conflicts:
	src/edu/csf/client/GameGUI.java