Added Git's attributes file to merge strategy ours.
Added Git's attributes file to merge strategy ours.

FOShameDotOrg/fuzzy-octo-shame,virtuoushub/fuzzy-octo-shame,Hornswaggler/fuzzy-octo-shame,FOShameDotOrg/fuzzy-octo-shame,virtuoushub/fuzzy-octo-shame