adding a .gitattributes file to avoid issues with end-of-line separators changed on Windows
Merge remote-tracking branch 'upstream/master'
answer 1-5