First change to functions
Merge branch 'master' of https://github.com/doubleamp/ProgrammingAssignment2
Second changes to functions