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

Conflicts:
	ControlAsistencia/models.py