Fixed channel websockets, added ugly logo/header, improved handles.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	js/controllers.js
Fixed lingering channels and rejoining bug.