version 1 programming assignment 2
Merge branch 'master' of https://github.com/gregorybosch/ProgrammingAssignment2

update