update README

Conflicts:

	README.md