local 2nd commit:Zhi Liu modify first_file.c locally
Merge branch 'master' of https://github.com/ZhiLiu/test

Conflicts:
	first_file.c
Merge branch 'master' of https://github.com/ZhiLiu/test
I need to merge it