Teste commit
testando commit
Merge branch 'luiz' of https://github.com/tortoyoyo/trabalhoHtml into luiz

Conflicts:
	index.html
Projeto criado com o Netbeans
teste layout bootstrap