Add cool feature
Add complex feature
Corrected file
Merge branch 'cool-feature' into develop
Merge branch 'complex-feature' into develop
Add content
Merge branch 'cool-feature' into develop