Added Cart

Added cart page.
Added new logo.
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/header.css
	css/style.css
	images/logo.png