skal pulle fra master
Merge branch 'master' into working
fikser smaatterier
sdf
skal merge fra master
merget
dff
gd
dfd
fdsfd
sdfsdf
sdfdf
Merge branch 'working'