readme update

Conflicts:
	README.txt
update
update