Merge branch 'branch2'

Conflicts:
	Projeto teste/arquivoTeste.rtf
Merge branch 'branch3'

Conflicts:
	Projeto teste/arquivoTeste.rtf