modifired two files ,readme.txt and test.txt

this is the detail infomaition yy

yayd

y

adsfafd
add a line

xxxxxxxxxxxxxxx
xxxxxxxxxxxxx
modifil from experimental branch

xxxxxxxxxxxxxxx
add .....
merge two braches
addd lll
aaaaa
commit by git add -i
Merge branch 'mywork'
and recuse the confilickt
Conflicts:
	readme.txt
	test.txt