add hello
third commit
dengyu branch commit
fea1 commit
master commit
fix conflict
add hello.c
add fine.c
master change hello.c
Merge branch 'dengyu1'
bug is ok
bug is ok in issue01
merged bug fix issue