asdasdasdas
Merge branch 'master' of github.com:lennin92/Sistema_Venta
asdf
poilk,mjngfbdvc
modified:   WebContent/TipoVta/consultarTodos.jsp
asfd
as
a
s
Merge remote-tracking branch 'origin/master' into Alex

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebContent/prueba.html