Teste o conflito!
Merge branch 'master' of https://github.com/cesarouchida/TesteDemontracao.git
Merge branch 'master' of
https://github.com/cesarouchida/TesteDemontracao.git

Conflicts:
	Demostracao/src/test/Teste.java