change test text
change commit?
Merge pull request #1 from ysoeno/new_branch

ok
Merge branch 'master' into new_branch2

Conflicts:
	README.md
conflict del