cursos finalizado 4:43am
Merge remote-tracking branch 'origin/master'

Conflicts:
	configuracion/configuracionGeneral.html
	configuracion/modificarCarrera.html