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

Conflicts:
	principal/Alumno/views.pyc