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