oppgave1 40%
Merge branch 'master' of github.com:junjunguo/TDT4100