Mantenimiento alumno

agrega,modifica,elimina
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/funciones.js