last commit..
Merge branch 'master' of https://github.com/efraindx/Gestor-de-Pacientes

Conflicts:
	modelos/ModeloPruebas_Laboratorio.java
	vistas/VentanaModeloResultados_Pruebas_Laboratorio.java