Updated readme

Conflicts:
	README