homework 6 final
Merge branch 'master' of https://github.com/Jjarve/Cervisiam