Claos
Merge remote-tracking branch 'origin/Christer'
Merge branch 'master' of https://github.com/mleithaug/Bachelor_oppgave