Controlador
Merge branch 'master' of https://github.com/alioth865/GestorDeTiempo