another change
Merge branch 'master' into 2

Conflicts:
	README.md
Merge pull request #3 from wfarr/2

another change