update readme
Merge branch 'master' into frink

Conflicts:
	README.md