adding in .gitattributes newline issues

Trying to resolve the newline commit issue where all file is
auto-selected for merging instead of line by line.
another update to .gitattributes for csharp merges
Merge remote-tracking branch 'upstream/master'