merget med haavard
sdf
Merge branch 'master' into working
sdf
sdg
sdf
sdf