update #2
Merge branch 'master' of https://github.com/KEisenhart/ProgrammingAssignment2