URL FINI / ADMIN /
Merge branch 'master' of https://github.com/Moana007/Projet-Shftie

Conflicts:
	.gitignore
	view/home/catalogue/new.php
	view/home/show_recipe_user.php