a
Merge branch 'master' of github.com:allaeia/CAMASH_jeu

Conflicts:
	js/js.js
Merge branch 'master' of github.com:allaeia/CAMASH_jeu
Merge branch 'master' of github.com:allaeia/CAMASH_jeu
js/js.js
a
Merge branch 'master' of github.com:allaeia/CAMASH_jeu