//test
//ajout du dossier articles
//modification questionnaire
Merge remote-tracking branch 'origin/pierre'

Conflicts:
	.idea/misc.xml
	www/commons/router.js
	www/index.css
	www/index.html
	www/index.js
	www/index.scss
	www/menu/menu.html
Commit