Roll it back to noon. Afternoon's change bork it.
Continuing where left off, roughly.
code cleaning
Merge branch 'master' of https://github.com/tcb-hr/feed
fixing stuff
res.end()
Looking good.
res.end()
Merge branch 'master' of https://github.com/tcb-hr/feed

Conflicts:
	app/scripts/controllers/main.js
	app/views/index.html
Merge branch 'cans2'

Conflicts:
	app/scripts/controllers/main.js
	app/views/partials/main.html
	lib/controllers/chat.js
Merge pull request #46 from janaspage/master

Merging Alex's post-fix with Janas's error-handling.
pull time
master merge
master merge
merging on insanity
oauth
oauth front
Merge branch 'master' of https://github.com/tcb-hr/feed
Cutting branch.
chat.body now resets upon send, & 'send' refused if body undefined.