first commit
first commit
add a.c
amin
Merge branch 'master' of github.com:zizhour/first
Merge branch 'master' of github.com:zizhour/git_c

Conflicts:
	a.c
	test.c