Commiting both required functions
Fixing documentation
Fixing code
Merge branch 'master' of github.com:adrprog2014/ProgrammingAssignment2