Merge branch 'cart_styling'
Merge branch 'master' of https://github.com/ebarr/robfordshop