Merge pull request #3 from Harry-wj/testbr_1

add gogogogogo
test modify
commit with branch test
add hello map in hello.txt.
zhanghua test commit
Merge pull request #11 from deavey/zhanghua

zhanghua test commit
Merge pull request #8 from tangbo2013/test_tang

add hello map in hello.txt.
rebase最新分支，合并