change on readme

Conflicts:

	README