Update README.md
Merge remote-tracking branch 'origin/parallel-edits'

Conflicts:
	README.md