xuhao 修改
Merge branch 'master' of https://github.com/xknxkn/xkntest
xuhao 修改
Conflicts:
	score_record.txt
Merge branch 'master' of https://github.com/xknxkn/xkntest
test_push
Merge branch 'master' of https://github.com/xknxkn/xkntest
test
Conflicts:
	score_record.txt
Merge branch 'master' of https://github.com/xknxkn/xkntest
test