7
Merge remote-tracking branch 'remotes/origin/branch1' into branch2

Conflicts:
	README.md