Adicionando o Hi.txt
Merge branch 'origin/master-3'
Oie novo 1
Oi gentem 2
Novo oi gentem
Merge branch 'origin/master-3'

Conflicts:
	Oie.txt
Merge branch 'origin/nfun3'