added shopping cart page
fixed merge conflict