asd
Merge branch 'master' into lokal
preface og abstract
asd
asd
sdfsdf
Merge branch 'working'
pulled jonas
merged
yeaah
skal merge alt fra frode
Merge branch 'working'
rettet modellene
asd
Merge branch 'lokal'
yeaah
asd
asd
Merge branch 'lokal'
skal pulle det haavard har retta