Se sacó el slider
Merge branch 'master' of github.com:R91/webestudio

Conflicts:
	app/controllers/site_controller.rb
Se modificó el formulario
Merge branch 'master' of github.com:R91/webestudio