g1 add rrrr 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'