Merge pull request #7 from ndavis10/master

update
Merge pull request #5 from ndavis10/master

Update from upstream
Updated Computer model, schema
changes
Merge branch 'master' of https://github.com/ndavis10/ComputerStoreFinal.git
Merge pull request #31 from Barterdm04/master

Merge pull request #7 from ndavis10/master
Checkout now functional
Updated Seed Method / Part Images
Merge branch 'master' of https://github.com/ndavis10/ComputerStoreFinal.git
Merged shit or something
Merge branch 'mcarpenter5-master'
Merge pull request #33 from mdeboer1/master

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

update from upstream