Assignment complete
Merge branch 'master' of https://github.com/jjmckay/ProgrammingAssignment1