update
Merge branch 'master' of github.com:mailzwj/n-guide

Conflicts:
	.gitignore
	Gruntfile.js
	README.md
	abc.json
	package.json
update