COMMIT SA MERE
Merge branch 'master' of https://github.com/Kevin445/Derniere_semaine_intensive

Conflicts:
	home/style.css
	public/.DS_Store
	public/css/style.css
encore commit sa mere