Commit simulando conflito

Simulando conflito com o Yuri00
Merge branch 'master' of https://github.com/Pedro-Veronezi/TreinamentoGit

Conflicts:
	index.html