added feature2
added second feature2
Merge branch 'some-feature2' into develop