Manejo de Sesiones creado
Merge remote-tracking branch 'origin/master'

Conflicts:
	cliente/views.py
Merge remote-tracking branch 'origin/master'
Manejo de Sesiones creado