Merge branch 'master' into Alessandro
Merge branch 'master' into Alessandro
PANIER
changing styles
Merge branch 'Alessandro' of https://github.com/ThomasAy/Projet1 into Alessandro

Conflicts:
	Projet1 - Brouillon/medias/pictures/Thumbs.db
	Projet1 - Brouillon/output_fns.php
	Projet1 - Brouillon/product_fns.php
Merge branch 'Alessandro'

Conflicts:
	Projet1 - Brouillon/output_fns.php