prøver nokke
Merge branch 'master' into hegdal
Merge branch 'hegdal'