panier add php
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/products/shop.php
force push
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/products/shop.php