commit de mierda
Merge branch 'master' of https://github.com/dantebarba/ProyectoIngenieriaII

Conflicts:
	administrador/modalLibro.php