Vote et accueil
Merge branch 'master' of https://github.com/Moana007/Projet-Shftie

Conflicts:
controller/home/add_recipe_book.php
view/html/footer.php
view/html/header.php
Revert 9174971..8c3a1c3

This rolls back to commit 9174971e871fa425a767ae3cd0eb230735a572f7.
Revert "Revert 9174971..8c3a1c3"

This reverts commit 60bc09b24fbfa1332ad0e048858c2db730796043.
Merge branch 'master' of https://github.com/Moana007/Projet-Shftie

Conflicts:
	controller/home/add_recipe_book.php
	view/html/footer.php
	view/html/header.php