合并分支
Update README.md
合并分支
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
合并分支
合并分支
Merge remote-tracking branch 'remotes/origin/dev'
Merge remote-tracking branch 'origin/master' into dev
更新seajs为2.0.0版本