g1 add uuuu conf2
solver conflicts e merge

Merge branch 'pr/n3_gerrysousa'

Conflicts:
	Novo Documento de Texto.txt
Resolvendo conflido e merge
Merge branch 'pr/n4_g-emerson'