guardar cita front
Merge branch 'development' of git@github.com:HackAcademy/hack4geeks.co.git into development

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