branch1 commit
branch2 commit
master commit
Merge branch 'branch1'
Merge branch 'branch2'

Conflicts:
	readme.txt
master commit