Changements...
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin

Conflicts:
	js/GameEntity.js
	js/GameScreen.js
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin

Conflicts:
	js/GameEntity.js
	js/GameScreen.js