detalles finales 4:50am
Merge remote-tracking branch 'origin/master'

Conflicts:
	configuracion/consultarCarrerasCarreraModificada.html
	js/configuracion.js