the shopping cart is working
shopping cart
Merge pull request #22 from genenettles2/master

the shopping cart is working
merge before commit
Fix merge conflicts