Consulta usuario OK,Consulta asig(incompleto)
Merge remote-tracking branch 'origin/master'

Conflicts:
	tutorias/form.py
	tutorias/templates/miPanel.html
	tutorias/views.py