WIP
Merge branch 'master' of https://github.com/helloracheldian/foxweb

Conflicts:
	css/shop.css