"Carlos commit"
Merge branch 'master' of https://github.com/mcsnows/Projeto1

Conflicts:
	teste2.txt