aa
Signed-off-by: Antonio Rezene Neto <rezendeneto@live.com>
zica

Signed-off-by: Antonio Rezene Neto <rezendeneto@live.com>
Merge branch 'master' of https://github.com/johntheo/ProjetoFinalWeb

Conflicts:
	Projeto Netbeans/trabalho-final/src/main/webapp/css/bootstrap.css
	Projeto Netbeans/trabalho-final/src/main/webapp/css/bootstrap.min.css
	Projeto Netbeans/trabalho-final/src/main/webapp/fonts/glyphicons-halflings-regular.eot
	Projeto Netbeans/trabalho-final/src/main/webapp/fonts/glyphicons-halflings-regular.svg
	Projeto Netbeans/trabalho-final/src/main/webapp/fonts/glyphicons-halflings-regular.ttf
	Projeto Netbeans/trabalho-final/src/main/webapp/fonts/glyphicons-halflings-regular.woff
	Projeto Netbeans/trabalho-final/src/main/webapp/js/bootstrap.js
	Projeto Netbeans/trabalho-final/src/main/webapp/js/bootstrap.min.js

Signed-off-by: Antonio Rezene Neto <rezendeneto@live.com>
corrigido link para consulta!