persist into db
Merge pull request #1 from bhelx/twitter_auth_persist

persist into db
Merge remote-tracking branch 'origin/master' into sockets

Conflicts:
	app.js
	views/index.ejs