commit branch 2
commit 2
Merge branch 'branch2'

Conflicts:
	README.md