ndavis10/ComputerStoreFinal — pull request #6 by mdeboer1 (2014-11-19 20:57:50+00:00)
Title: Merge pull request #1 from ndavis10/master

update from upstream