Looking great.
Merge branch 'reheader' into channels-init

Conflicts:
	app/views/channels/index.html.erb
	app/views/channels/show.html.erb