.gitattributes

I should really learn how to merge properly...