Commiting my cart changes
Merge remote-tracking branch 'upstream/master'
update cart
merge conflict fix
Updates to cart
Merge pull request #12 from richsalvucci/master

Cart changes