Merge pull request #1 from AviMoto/master

CSS
CSS
Merge branch 'CSS' of https://github.com/davethenet/shop into css

Conflicts:
	index.php
Merge branch 'master' of https://github.com/AviMoto/shop