Merge origin/master

Conflicts:
	README.md
versao 2

Conflicts:
	README.md