asdfasd
	modified:   main.c
Merge branch 'master' of https://github.com/rongzhj1990/gitlearning
	modified:   main.c
	new file:   test.c