prueba de conflicto
Merge branch 'master' of https://github.com/nathy29/Ltic

Conflicts:
	src/ltic/ConexionSQL.java