Agrega diseno de interfaz de calendario de plan quirurgico
Merge branch 'master' of github.com:luisincrespo/quirofanos-cmsb

Conflicts:
	plan_quirurgico/templates/plan_quirurgico/calendario.html
	quirofanos_cmsb/settings.py
	quirofanos_cmsb/urls.py
	static/css/style.css
Agrega diseno de interfaz de mis solicitudes
Merge branch 'master' of github.com:luisincrespo/quirofanos-cmsb

Conflicts:
	static/css/style.css