finish assign2
Merge branch 'master' of https://github.com/12TParker/ProgrammingAssignment2