algunos cambios
Merge branch 'master' of https://github.com/pelaogon/taller-integral

Conflicts:
	administrador/consultar.php
	administrador/reporte_historial.php
	css/estilo.css
	guardia/index.php
	guardia/procesar_entrada.php
	mpc.sql