shopping cart
Merge branch 'development' of https://github.com/thebookofeveryone/website into development

Conflicts:
	css/css/common.css