added shopping cart
Merge shoppingcart