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

Conflicts:
	bas.inc.php

	modified:   aide/aide.css
	modified:   aide/aide.php
	modified:   bas.inc.php
	modified:   css/global.css
	modified:   haut.inc.php
	modified:   index.php
	new file:   resultat.php