Update README.
Merge remote-tracking branch 'github/HEAD'

Conflicts:
	README