alterações locais
Merge branch 'master' of https://github.com/AndersonFurlane/grooview-landing

Conflicts:
	app/controllers/pages_controller.rb
	app/views/pages/index.html.haml
	config/routes.rb