add trendsets
Merge branch 'master' of heroku.com:excellent-russian

Conflicts:
	views/index.haml
whoops
Merge pull request #23 from ashleygwilliams/master

leaderboard looks way f'in betta
Merge branch 'master' of github.com:modality/hearst
HEARST LOADER :skull:
Merge branch 'master' of git://github.com/ashleygwilliams/hearst
Merge branch 'master' of git://github.com/ashleygwilliams/hearst

Conflicts:
	views/index.haml
Merge branch 'master' of git://github.com/modality/hearst
fix banner more