arreglo al contar días usados*
Merge remote-tracking branch 'origin/master'

Conflicts:
	salidas/models.py
	salidas/views.py