updating sql
changing font folder
add hash pwd in SESSION
add logout check admin
adding categories
styling purposes
Merge branch 'master' of vogsphere.42.fr:web-1-001/2013/par-2-1/rush00/jbalestr

Conflicts:
	htdocs/admin_categories.php
error articles and injection sql
Merge branch 'master' of vogsphere.42.fr:web-1-001/2013/par-2-1/rush00/jbalestr
deleting things
deleting users
Merge branch 'master' of vogsphere.42.fr:web-1-001/2013/par-2-1/rush00/jbalestr
adding link to admin in admin_users
styling purposes
updating article
manage cart
Merge branch 'master' of vogsphere.42.fr:web-1-001/2013/par-2-1/rush00/jbalestr
edit user (pas encore tout a fait ok)
changing escape string to procedural style
Merge branch 'master' of vogsphere.42.fr:web-1-001/2013/par-2-1/rush00/jbalestr