gs add 13
ge add 14
Merge branch 'master' of https://github.com/g-emerson/Git_Test into server

Conflicts:
	Novo Documento de Texto.txt
merge