je me déteste
um trySomeShite
Merge branch 'master' of https://github.com/ldev6/ManETS_Server

Conflicts:
	src/ca/etsmtl/gti785/ServletManETS.java
	src/ca/etsmtl/gti785/model/PlayerState.java