Added .gitattributes to repository
Merge branch 'origin/master'