in new-branch
in master
Merge branch 'new-branch'

Conflicts:
	readme.txt
commit