Solved the programming assignment
Merge branch 'master' of https://github.com/Teots/ProgrammingAssignment2