js代码

操作节点
Merge remote-tracking branch 'origin/master'

Conflicts:
	script.js