y
juju
email
Merge remote-tracking branch 'origin/calificador' into master-2
calificar
mail macho
volviendo al login
Merge remote-tracking branch 'origin/calificador' into master-2
casi terminado
Merge remote-tracking branch 'origin/calificador' into master-2
Merge pull request #8 from freddycc/master-2

Master 2