Changed the function to reflect the assignment.
Merge branch 'master' of https://github.com/Chris-Laz/ProgrammingAssignment2