ndavis10/ComputerStoreFinal — pull request #16 by mdeboer1 (2014-12-01 20:13:52+00:00)
Title: Merge pull request #4 from ndavis10/master

update from upstream