new feature commit 1
f2
Merge pull request #1 from stian0/new-feature-1

New feature 1 - pull