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

Conflicts:
	principal/Alumno/__init__.pyc
	principal/Alumno/models.pyc
	principal/Alumno/reporteHorario.pyc
	principal/Alumno/reporteKardex.pyc
	principal/Alumno/urls.pyc
	principal/Alumno/views.pyc
	principal/__init__.pyc
	principal/admin.pyc
	principal/forms.pyc
	principal/managers.pyc
	principal/models.pyc
	saes.db
	saes/__init__.pyc
	saes/settings.pyc
	saes/urls.pyc
	saes/wsgi.pyc