Terminado 19%
Listo 19%

Conflicts:
	src/java/DBMS/DBMS.java
	src/java/Form/AgregarMatForm.java
	web/CSS/jquery.alerts.css
	web/JS/jquery.alerts.js
	web/JSP/GestionInventario/GestionMat.jsp
	web/WEB-INF/struts-config.xml