hodoe
Resolvendo conflitos

Conflicts:
	README.md
Merge branch 'Peaga0-master'