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

Conflicts:
	hustgroup1/group1_score
	hustgroup1/group1_score.c
add return 0
KardLu group1 Makefile changed
hyieeh已修改
Merge branch 'master' of http://github.com/xknxkn/xkntest
   linmiaomiao
Merge branch 'master' of http://github.com/xknxkn/xkntest

Conflicts:
	hust_esd_score
	hustgroup1/group1_score
	hustgroup2/group1_score
	hustgroup3/group1_score
	hustgroup4/group1_score
	hustgroup5/group1_score
Merge branch 'master' of http://github.com/xknxkn/xkntest

Conflicts:
	hustgroup4/group1_score
linmiaomiao
test push
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
solve conflict
note first printf
add clean *~
Merge branch 'master' of https://github.com/xknxkn/xkntest
group 3
hjkhjkhkkh;
Merge branch 'master' of https://github.com/xknxkn/xkntest