Hitbox du joueur le suit
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin

Conflicts:
	js/GameScreen.js
collide update 3
Merge branch 'kevin'
LE VAISSEAU TIR OMG
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin

Conflicts:
	index.html
	js/GameEntity.js
	js/GameScreen.js
Vitesse de tir
Collide modif
Merge branch 'Robin'
reglage conflit merge
begiing collsions
Merge sucessful