Week 7
Merge branch 'master' of https://github.com/jxx/uio-inf1100

Conflicts: