discussion.tex
gjort noen endringer
Merge branch 'master' of https://github.com/mtarnes/masteroppgave