Merge pull request #25 from SpyMaster356/Reporter

Reporter
Stephen said to commit, so i am

blah
update
fixed?
Merge branch 'Customer' of https://github.com/SpyMaster356/Assignment-2 into Customer
Merge pull request #26 from SpyMaster356/master

update
Merge pull request #28 from SpyMaster356/Customer

Customer