tela do medico - fazendo.
Merge branch 'master' of https://github.com/vitorabner/healthyriver

Conflicts:
	app/controllers/appointments_controller.rb
	config/routes.rb