Merge branch 'master' of https://github.com/g-emerson/Git_Testes into g_master

Conflicts:
	Operacoes.txt