第三次提交
Merge remote-tracking branch 'wangyun/master'

Conflicts:
	Gruntfile.js
Merge remote-tracking branch 'wangyun/master'

Conflicts:
	Gruntfile.js
gei wang
Merge pull request #3 from bestdqf/master

接受指正！