Homework
Merge branch 'master' of https://github.com/Lammikko/ProgrammingAssignment2