everyone should have a gitignore
Finish Feature-1
Merge branch 'develop'