rafa

rafa
Merge branch 'master' of https://github.com/gmomc/SAES1

Conflicts:
	principal/Alumno/reporteHorario.pyc
	principal/Alumno/urls.pyc
	principal/Alumno/views.pyc
	principal/models.pyc