最终正确版!
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform

Conflicts:
	javascript/test.js