add 11111
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.
add new branch by yxq
rebase最新分支，合并
Merge pull request #4 from Harry-wj/testbr_1

add 11111

merge 111 and "Hello map".
Merge pull request #13 from yangxiaoqian/yangxqbranch2

add new branch by yxq