pulling jenny's css
Merge branch 'master' of https://github.com/bayejjh/CI-eCommerce-Website

Conflicts:
	application/views/store.php
Merge branch 'master' of https://github.com/bayejjh/CI-eCommerce-Website