ny endring
Merge branch 'master' of https://github.com/bjoval/first
whatever