Added Git Attributes

Should avoid some basic merge conflicts