name change test
test1
Te

add sth
experiment

ex add sth
bob add
alice side
Merge branch 'master' of ../testgit/project-C

Conflicts:
	hello.c
bob add 2nd
Merge branch 'master' of /home/zhaohan/Study/c-pro

Conflicts:
	hello.c