Merge branch 'Filtros' of https://github.com/thiagovsk/To_de_Olho into Filtros

Conflicts:
	Gemfile.lock
Inserindo Top 5 de convenios mais caros e mais baratos
Merge branch 'Filtros' of https://github.com/thiagovsk/To_de_Olho into Filtros

Conflicts:
	Gemfile.lock
	app/views/home/show.html.erb