made other changes
Merge branch 'master' of https://github.com/rongzhj1990/gitlearning

Conflicts:
	main.c

	modified:   README.md