:boom::camel: Added .gitattributes & .gitignore files
minor comment change
Merge remote-tracking branch 'upstream/master'