Initial commit
add a.c
Convert to a.c
add b.c
Test commit
remove
c.c untracked
add c.c
aa
commit
aa
aa
Merge branch 'master' of github.com:mayjune/Test
merge 된거 수정해서 commit

Conflicts:
	a.c
	b.c
	c.c