tirei de uma pasta e pus em outra, para fazer um teste de commit
Merge branch 'master' of https://github.com/MackenzieUniversity/Aquita

Conflicts:
	Aquita/web/busque-jogo.jsp
	Aquita/web/cadastre-se.jsp
	Aquita/web/caracteristicas.jsp
	Aquita/web/contato.jsp
	Aquita/web/index.jsp
	Aquita/web/sobre-nos.jsp
	Aquita/web/style.css
Merge branch 'master' of https://github.com/MackenzieUniversity/Aquita

Conflicts:
	Aquita/web/busque-jogo.jsp
	Aquita/web/cadastre-se.jsp
	Aquita/web/caracteristicas.jsp
	Aquita/web/contato.jsp
	Aquita/web/index.jsp
	Aquita/web/sobre-nos.jsp
	Aquita/web/style.css