adding shopping cart and products
fixed schema merge conflict