teste
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjetoTeste/artifact-do-povo/src/main/java/Arara.java