2
Merge branch 'master' of https://github.com/henriquebol/metodos-git.git

Conflicts:
	Teste.c