latest changes
Ultimos archivos Merge branch 'master' of https://github.com/gonzalezf/Tarea1

Conflicts:
	build/web/WEB-INF/classes/controlador/ingresarcompra.class
	build/web/WEB-INF/classes/controlador/ingresarventa.class
	build/web/WEB-INF/classes/modelo/registro.class
	build/web/ingresarcompra.jsp
	build/web/ingresarventa.jsp
	ingresarcompra/ingresarcompra.java
	src/java/controlador/ingresarventa.java
	web/ingresarcompra.jsp
	web/ingresarventa.jsp