Update README.md
Merge branch 'master' into bookshelf

Conflicts:
	README.md
Merge branch 'bookshelf' into bookshelf-express

Conflicts:
	README.md