New feature
Second commit on new feature
Merge branch 'feature/cool' into develop