allo
Merge branch 'dev' of https://github.com/malmuki/Tp3-RTS-A14.git into
dev

Conflicts:
	TP3/src/ca/csf/RTS/game/Game.java
	TP3/src/ca/csf/RTS/game/GameController.java