Test commit
Merge pull request #1 from ulvmoen/master

Test