Updatd files '.gitattributes' and '.gitconfig'.
Merge remote-tracking branch 'refs/remotes/origin/master'