web.xml
web.xml
Merge branch 'master' of https://github.com/jhonata-p-martins/progweb_USP

Conflicts:
	nbproject/private/private.xml
	src/java/logic/ServletWeb.java
	src/java/logic/ServletWebInit.java
	web/pagina1.jsp
	web/pagina2.jsp
Merge branch 'master' of https://github.com/jhonata-p-martins/progweb_USP

Conflicts:
	src/java/logic/ServletWebInit.java
Merge branch 'master' of https://github.com/jhonata-p-martins/progweb_USP

Conflicts:
	src/java/logic/ServletWebInit.java