torsdag kveld
skal merge
Merge branch 'working'
merged
helg
intro
asdas
Merge branch 'lokal'
fu
fixed pull
fixed linje greier
Merge branch 'lokal'
asd
intro ferdig for dagen
asda
Merge branch 'lokal'
EF
FEF
Merge branch 'master' into working
fixed merge