make a change
Merge pull request #2 from wfarr/1

make a change
Merge branch 'master' into 2

Conflicts:
	README.md