changed a fiel
updated readme

Conflicts:
	README.md