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

Conflicts:
	css/global.css

	modified:   bas.inc.php
	modified:   css/global.css