first cut of shopping cart
Added new feature to shopping cart
Merge branch 'cart'