mise en place du layout
Merge branch 'master' of github.com:medamineagzid/eproject-distant

Conflicts:
	app/routes.php
resolution de conflit