branch test
simple
simple.
conflict fixed
branch dev githut
Update hello.txt

modified in github
client2
client1
Merge branch 'dev' of https://github.com/qingpengchen2011/gittest into dev

client1