Last final try. This time I mean it.
Merge branch 'master' of https://github.com/GrantAiton/ProgrammingAssignment2