add code for feature 1
i resolve merge conflict
Merge branch 'feature1'
:tada: Added .gitattributes & .gitignore files