Workaround Readme

Resolve uns conflitos da parada.
Conflicts:
	README.md