chengxinke add
xinke modfile 2
Merge branch 'master' of github.com:ChudanWang/first-proj

Conflicts:
	main.c