Merge branches 'canchivilca' and 'tonyid' of http://version.sacooliveros.edu.pe/jguevara/horario into tonyid
