Fiche produit les mecs !!
début admin
now able to add product
Cart Updated
commit
resolving conflict
adding add_product.php
removing useless message
resolving sorting issue
Merge branch 'Ouch'

Conflicts:
	Projet1 - Brouillon/output_fns.php
Merge branch 'master' into Ouch
resolve
Merge branch 'Ouch' of https://github.com/ThomasAy/Projet1 into Ouch
a little adjustement
Final
Merge branch 'Ouch'
removing isset session
Merge branch 'Alessandro'

Conflicts:
	Projet1 - Brouillon/TopBar.css
some MAJ
Merge branch 'master' into Alessandro