g1 add hhhh
Merge branch 'master' of https://github.com/g-emerson/Git_Test
Merge branch 'G2-master'

Conflicts:
	Novo Documento de Texto.txt
conflitos
g2 add 11