V2, Design and dev modify
Merge branch 'master' of https://github.com/Moana007/Projet-Shftie

Conflicts:
	assets/ajax/upload_img.js
	assets/css/css.css
	controller/home/submit_recipe.php
	view/home/catalogue/new.php
	view/home/catalogue/rand.php
	view/home/content_submit_recipe.php
	view/home/recipe_page.php