modifié:         js/app.coffee
Merge branch 'master' into gh-pages
	modifié:         js/app.coffee
Merge branch 'master' into gh-pages
	modifié:         js/app.coffee
Merge branch 'master' into gh-pages