cambios a modelo
Merge branch 'master' of https://github.com/danielstp/ControlAsistencia

Conflicts:
	ControlAsis/settings.py