Page site de vente fini
Page site de vente fini renommage des templates
Les 2 site fini
Merge origin/Homepage into Homepage

Conflicts:
	assets/css/shop-homepage.css
	templates/header.php
	templates/sidebarCompte.php
	view/historiquePanier.php
	view/panier.php