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

Conflicts:
	ControlAsistencia/models.py