Merge pull request #3 from g-emerson/master

gersous pediu para obter de g-em
Merge pull request #4 from g-emerson/master

gm vai mandar para gesou
inserido llll
gs add lll gs
Merge branch 'master' of git://github.com/g-emerson/testeConflitos

Conflicts:
	Novo Documento de Texto.txt
jjjj gs
Merge pull request #3 from gerrysousa/master

gm pede o cod de gs