Oppgave 1 og 2 ferdig.
Merge branch 'master' of https://github.com/bsamseth/ast1100-oblig-6

Needed to sync remote changes before pushing