Added Portraits to Queue'd units
Added Portraits to Queue'd units
Merge branch 'devUI' of https://github.com/malmuki/Tp3-RTS-A14 into devUI
Portraits should work. Waiting on game.allo(); Method to be implemented.
Merge remote-tracking branch 'origin/dev' into devUI
Uhhhh idk
Merge remote-tracking branch 'origin/dev' into devUI
lol
QUEUE WORKS
Fixed bugs
Merge pull request #91 from malmuki/devUI

Dev ui
Sounds and Music
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/GameController.java
Merge pull request #92 from malmuki/Francois

Francois
minion spawn sound!!!
preps for forge
Merge remote-tracking branch 'origin/dev' into Gab

Conflicts:
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/WatchTower.java