:space_invader: Added .gitattributes & .gitignore files
更新
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	index.html