zdded a tree! yay ecology!
Merge branch 'dev' of https://github.com/malmuki/Tp3-RTS-A14.git into
Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/WatchTower.java
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/human/Human.java
merge resolve
Merge pull request #38 from malmuki/Francois

Francois