Description main.js
Merge branch 'test001'

Conflicts:
	js/main.js
Ajout commentaires
Merge branch 'test001'