new test file

testing add files
add file to test branch
add file to branch test2
Merge branch 'test1' into test2
add file to master branch
Merge branch 'test2'
add test4 to branch test2
add test4 to master branch
Merge branch 'master' into test2
add test5 to master branch
add test5 to branch test2
Merge branch 'master' into test2

Conflicts:
	test5.txt
add test6 to branch test1
Merge branch 'test1'
add file to test branch
Merge branch 'test2' into test1
dd test7 to branch test1
Merge branch 'test1'
Merge branch 'master' of https://github.com/LinkDX/Mybranch.git