CORRECCION

Se ha arreglado un conflicto de configuración
Merge remote-tracking branch 'origin/master'

Conflicts:
	clinic/clinic/settings.pyc
	clinic/patient/models.pyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	clinic/clinic/settings.pyc
	clinic/consultation/models.py
	clinic/patient/models.pyc