add 1 2 and 3
Merge branch 'master' of github.com:ChudanWang/first-proj

merge branch

Conflicts:
	main.c