Merge pull request #1 from ndavis10/master

Update from upstream
Adding shopping card class / controller
Merge pull request #7 from mcarpenter5/master

Merge pull request #1 from ndavis10/master