test shoot
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
Merge branch 'master' of http://github.com/Maxipanda/N-Six into laurianne
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
Merge branch 'master' of http://github.com/Maxipanda/N-Six into laurianne
ScoreManager
Merge branch 'master' of http://github.com/Maxipanda/N-Six into laurianne
update IA
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin

Conflicts:
	js/GameEntity.js
Collide continue
Merge branch 'christophe' of https://github.com/Maxipanda/N-Six
Hitbox du joueur le suit
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin

Conflicts:
	js/GameScreen.js
Merge branch 'laurianne' of https://github.com/Maxipanda/N-Six
remove comments
correction IA + merge
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
collide update 3
Merge branch 'kevin'