.gitignore and .gitattributes for best team merging.