debug
Merge branch 'master' of https://github.com/Mahi-Mahi/QuelBleuEtesVous

Conflicts:
	app/scripts/controllers/home.js