Adding a "feature"
Modifying the feature
Merge branch 'feature/testfeature' into develop