补充部分成绩
Merge branch 'master' of https://github.com/xknxkn/xkntest

Conflicts:
	hustgroup1/group1_score.c~