petit
Merge remote-tracking branch 'origin/master' into clem

Conflicts:
	WebContent/jeu.html
	WebContent/js/jeu.js
mise en commun arnaud et clement