sdfsdf
sdfsaa11
f#
Merge branch 'master' into working
endret
endret simulering i mod5
Merge branch 'working'