alteracao q n pode sobrescrever o miquinha
JUNTANDO AS 2 ALTERACOES

Merge branch 'master' of https://github.com/CPD-FTW/playground

Conflicts:
	README.md