Update README.
Merge branch 'api'

Conflicts:
	README.md