other side of test of merge
Merge branch 'master' of git://github.com/mycollaborator/scratch_repo

Conflicts:
	README.md