work on subfolder
Merge branch 'master' of https://github.com/Mahi-Mahi/QuelBleuEtesVous

Conflicts:
	app/index.html
	app/views/home.html