Merge branch 'master' of git://github.com/mycollaborator/scratch_repo

Conflicts:
	README.md
Merge branch 'master' of github.com:kbroman/scratch_repo