azertyuiop
Merge branch 'master' of github.com:jetoune/tp-synthese

Conflicts:
	app/logs/dev.log
responsive design
Merge branch 'master' of github.com:jetoune/tp-synthese

Conflicts:
	app/Resources/views/base.html.twig