Create the .gitattributes file from GitHub.
Merge branch 'master' of https://github.com/npowgit/git-conf-test.git