Continuing comments
Fixed merge conflicts from Liam's auth
Merge branch 'development' of https://github.com/mailcrunch/deployment into development

Conflicts:
	server/main/config.js
Merged Liev's changes to OAuth2
Merge branch 'auth' of https://github.com/mailcrunch/deployment into auth
Trying to fix auth
Getting OAuth2 tokens now
Converting to DB Auth
Fixing merge conflicts
Merge branch 'development' into auth

Conflicts:
	server/main/config.js
	server/main/passport.js
	server/note/note_controllers.js
Merge conflicts
Merge branch 'auth' of https://github.com/mailcrunch/deployment into auth

Conflicts:
	server/main/config.js