newfeature readme
second feature
Merge branch 'myfeature' into develop