test
Merge remote-tracking branch 'origin/Sprint5' into Klim
det virker ikke helt endnu
fixed merge error
make it work
Merge remote-tracking branch 'origin/Klim' into Sprint5