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