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

Conflicts:
	ControlAsistencia/admin.py
Merge branch 'master' of https://github.com/danielstp/ControlAsistencia