modified:   css/global.css
	modified:   haut.inc.php
Merge branch 'master' of https://github.com/ploko/ycommerce

Conflicts:
	css/global.css

	modified:   haut.inc.php
	new file:   inscription.php
	modified:   css/global.css
	modified:   haut.inc.php
	deleted:    img/charriot.png
	modified:   inscription.php
	new file:   categories.php