committing my changes
Merge branch 'master' of https://github.com/ajdover/ProgrammingAssignment2