Latest update
zomg
Merge branch 'master' of https://github.com/gonzalezf/Tarea1

Conflicts:
	build/web/WEB-INF/classes/controlador/ingresarventa.class
	build/web/WEB-INF/classes/modelo/registro.class
	build/web/ingresarventa.jsp
	build/web/probando.jsp
	src/java/controlador/ingresarventa.java
	web/ingresarventa.jsp
	web/probando.jsp
latest sourcecode
collitions resolved
Merge branch 'master' of https://github.com/gonzalezf/Tarea1

Conflicts:
	build/web/WEB-INF/classes/modelo/registro.class