Formattage de code
Merge origin/master

Conflicts:
	.sass-cache/5e611ad828b779e44f4164560adeb7da7c173c8b/app.scssc
	scss/app.scss