hyieeh已修改
Merge branch 'master' of https://github.com/xknxkn/xkntest

Conflicts:
	hust_esd_score
	hustgroup1/group1_score
	hustgroup1/group1_score.c
	hustgroup2/group1_score
	hustgroup3/group1_score
	hustgroup5/group1_score