oppgave 2 ferdig
Merge branch 'master' of https://github.com/henjak/innlevering3