modify test.txt
add wang.txt
Merge branch 'HEAD' of https://github.com/jinsandazi/TestGit.git

Conflicts:
	test.txt

Signed-off-by: jinsandazi <wangpeng@xunlei.com>