malade
MOINS DE SON
formatage
fais que l'on ne peux pas utiliser plus de ressource que l'on a pas
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/entity/state/Attack.java
	TP3/src/ca/csf/RTS/game/entity/state/Move.java
	TP3/src/ca/csf/RTS/game/pathFinding/PathFinder.java
debut des workers
finition de gathering
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/entity/state/Move.java
	TP3/src/ca/csf/RTS/game/entity/state/StateInteraction.java
Merge pull request #50 from malmuki/Francois

Francois