Merge pull request #1 from g-emerson/master

g2 pegar alteraçoes de g1
g2 add eeee shit
Merge branch 'master' of https://github.com/g-emerson/Git_Test into g-emerson-master

Conflicts: Solver conflitos
	Novo Documento de Texto.txt
Merge branch 'master' of https://github.com/g-emerson/Git_Test into g-emerson-master

Conflicts:
	Novo Documento de Texto.txt
Merge branch 'g-emerson-master'
g2 add tttt
Corrigindo commit

Merge branch 'master' into pr/n2_gerrysousa

Conflicts:
	Novo Documento de Texto.txt
corrigindo commit
Merge branch 'pr/n2_gerrysousa'