Merge pull request #1 from uptownjimmy/Brian

Brian
Merge pull request #2 from uptownjimmy/cartfunctionality

Cartfunctionality
Merge remote-tracking branch 'origin/master' into cartfunctionality