endret simulering i mod5
Merge branch 'working'
sdfsdf
easdasd
Merge branch 'working'
asd
pulled jonas
merged konklusjon med jonas sitt
sdf
Merge branch 'master' of https://github.com/hhalse/masterthesis
endringer gjort
sdf
Merge branch 'master' into working
sdfsdf Har skrevet paa konklusjonen