readme
latest updates

Conflicts:
	README.md