.gitattribures modified to avoid merging some files
Merge remote-tracking branch 'upstream/master'