Update main.c

test
Update main.c
Update main.c
Merge branch 'master' of https://github.com/zhengxj0802/zhengxj.git

Conflicts:
	main.c