Setting up Passport Twitter authentication
Merge branch 'master' of https://github.com/tara-marchand/tmarchand

Conflicts:
	package.json
More work on Passport Twitter authentication