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