Continuing where left off, roughly.
Looking good.
Merge branch 'cans2'

Conflicts:
	app/scripts/controllers/main.js
	app/views/partials/main.html
	lib/controllers/chat.js