First commit, all seems to be working well
Merge branch 'master' of https://github.com/elemwarr/ProgrammingAssignment2