feature1
Merge branch 'feature'
Added .gitattributes file