attempt to fix shoppingcart
Merge branch 'Jeff'