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

Conflicts:
	ControlAsistencia/views.py
filtros