resolviendo problemas
Merge branch 'reservas' of https://github.com/jjvelascog/pagina into reservas

merge