Merge pull request #1 from nanglin/testbranch

pull request
updated by nanglin
added line in merge
test
Merge branch 'testbranch'
test
Merge branch 'testbranch'

Conflicts:
	testbranch.txt
Merge pull request #3 from nanglin/master

send pull request