have a try
new version
Merge branch 'master' of github.com:ChudanWang/first-proj

Conflicts:
	main.c