hyieeh改
hyieehMerge branch 'master' of https://github.com/xknxkn/xkntest

Conflicts:
	hustgroup1/group1_score
	hustgroup1/group1_score.c
	hustgroup1/group1_score.c~
	score_record.txt