Remove .gitattributes its not needed.
Merge branch 'master' into gh-pages