Merge pull request #3 from g-emerson/master

g1 pede p/ g2 pegar dele
g2 add iiii conf2
solver conflicts e merge

Merge branch 'pr/n3_gerrysousa'

Conflicts:
	Novo Documento de Texto.txt
Resolvendo conflido e merge