Xinyu已修改
Merge branch 'master' of http://github.com/xknxkn/xkntest

Conflicts:
	hustgroup1/group1_score
	hustgroup1/group1_score.c
   linmiaomiao
linmiaomiao
merge
mergeMerge branch 'master' of http://github.com/xknxkn/xkntest

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