暂存
Merge branch 'gh-pages'

Conflicts:
	.gitignore
	Gruntfile.js
	package.json
	readme.md
1.0.0 released