Merge branch 'non-purchase-pages'
Made changes to conflicts with CSS
Added in header along with minor fixes
Added in new content
Validated pages
Fixed 5-col product resize issues
linked cart-img to cart.html
Code cleanup + minor updates
fix bullets and resizing on product_list and deals page
Merge branch 'master'