fikset tid
Merge branch 'master' of https://github.com/mtarnes/masteroppgave