Merge branch 'master' of http://version.sacooliveros.edu.pe/lgangas/trismegisto-planilla into lgangas