second try

second change
Merge branch 'master' into branch1

Conflicts:
	README.md
Merge pull request #1 from ablackm/branch1

second try