Merge pull request #1 from ndavis10/master

update from upstream
Merge pull request #2 from ndavis10/master

Updated layout and site.css again
Merge pull request #6 from mdeboer1/master

Merge pull request #1 from ndavis10/master
Merge pull request #2 from ndavis10/master

update to upstream
Merge pull request #7 from mcarpenter5/master

Merge pull request #1 from ndavis10/master
Merge pull request #8 from mcarpenter5/master

Modified ShoppingCart View
Merge pull request #9 from mcarpenter5/master

Update from upstream
Merge pull request #3 from ndavis10/master

Trying not to explode things
Merge pull request #10 from Barterdm04/master

Merge pull request #2 from ndavis10/master
Merge pull request #11 from mcarpenter5/master

Update from upstream
Merge pull request #12 from mdeboer1/master

Test
Merge pull request #2 from ndavis10/master

Update from upstream