Merge pull request #5 from g-emerson/master

teste pull ver no git
g1 add jkjkj
Merge branch 'G2-master'

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

Conflicts:
	Novo Documento de Texto.txt
Merge branch 'master' of https://github.com/gerrysousa/Git_Test

Conflicts:
	Novo Documento de Texto.txt
Merge branch 'master' of https://github.com/gerrysousa/Git_Test

Conflicts:
	Novo Documento de Texto.txt
Merge branch 'master' of https://github.com/gerrysousa/Git_Test into local

Conflicts:
	Novo Documento de Texto.txt