choice screen quasi opé
Merge branch 'master' of https://github.com/Warrows/projet-intensif-image-2015

Conflicts:
	ChoiceScreen.js
	Game.js
	LoadScreen.js