cool feature first commit
Merge branch 'myfeature' into develop