related channel shit
Merge branch 'master' of https://github.com/devilshaircut/youstars

Conflicts:
	app/controllers/suggest/channels_controller.rb