Conexión de trendings e iconos
Merge branch 'master' of https://github.com/julioguevara/FoursquareSantaFe

Conflicts:
	app/views/index.html