Remplisage de grille (premier partie)
Merge branch 'master' of https://github.com/Avangarde/crystal-crush

Conflicts:
	crystal-crush/public_html/js/crystal-crush.js