sdfsdf
sdfsdf
Merge branch 'master' into working
lest igjennom modell og concl
sdf
Merge branch 'working'