programming assignment 2 finished
Merge branch 'master' of https://github.com/caldwellst/programmingassignment2