Merge branch 'master' of E:\WebstormProjects\test_game with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_game/routes/index.js
删除数据库脚本
修改设置
修改设置
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_game/routes/index.js
完成设置功能开发
Merge remote-tracking branch 'origin/master'