Formatting
Merge branch 'master' of https://github.com/braddengross/ProgrammingAssignment2