added otherBranch entry
Merge branch 'otherBranch'

Conflicts:
	README.md