added shopping cart functionality
fixed schema merge conflict added shopping cart