inscription.php
	new file:   inscription.php
Merge branch 'master' of https://github.com/ploko/ycommerce

Conflicts:
	css/global.css