Laser en cours
Merge branch 'master' of github.com:xabufr/andromede
Laser OK

Conflicts:
	client/app/scripts/game.js