flyttat kod
works ready :sailboat:
Merge remote-tracking branch 'origin/master' into kollision-test-2.0