Connection logic
Merge branch 'master' of https://github.com/FChapeau/TP2_Drouin_Roy

Conflicts:
	src/edu/csf/server/Controller.java
	src/edu/csf/server/model/GameModel.java