skal pushe etter ferien
har pushet
sdf
Merge branch 'master' into working
sdfsf
gjort masse
Merge branch 'working'
har pullet fra haavard, smooth