xc
Cambios en hojas JSP
d
Merge origin/master

Conflicts:
	MayoristasNicas_1stVersion/web/index.jsp
	MayoristasNicas_1stVersion/web/viewProducts_.jsp
Revert "xc"

This reverts commit 84a46abdb1233704e9a1a03d617417b70d99b28c.
Revert "Cambios en hojas JSP"

This reverts commit e45717dce718544b057d2dda8e41bb3f8f499ccd.
Revert "d"

This reverts commit 3b72cb08872217b61a347e9fc89d02138f0b06a7.