modified readme.md to prep for staged merge conflict
Merge branch 'conflict-on-readme'

Conflicts:
	README.md