Adding feature 1 inside Class1
Adding more code
Still more code
Merge branch 'feature-1' into develop

Merging feature-1 into develop