Revert "rebase 8 okt"
Merge pull request #2 from osignell/revert-1-staging

Revert "rebase 8 okt"