feature commit
Merge pull request #1 from kristiankristensen/myfeature

feature commit