page accueil modif
merge fix
Merge branch 'master' of https://github.com/ISI-MTL/isaumon

Conflicts:
	accueil.php
	assets/img/Quiche_Saumon.jpg
	assets/img/Recettes/Quiche_Saumon.jpg
	assets/img/Recettes/mousse_dasperges_au_saumon.jpeg
	assets/img/mousse_dasperges_au_saumon_fume.jpeg
	assets/img/recettes/Quiche_Saumon.jpg
	assets/img/recettes/mousse_dasperges_au_saumon.jpeg