Fusion des deux versions
Merge branch 'master' of https://github.com/Bosion/Starcraft

Conflicts:
	Controller.cpp
	GameView.cpp
	Menu.cpp