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
worked on converting to oauth2 from passport-google
redirect not working
Merged Liev's changes to OAuth2
Merge branch 'auth' of https://github.com/mailcrunch/deployment into auth
Both access token and refresh token now coming in for user
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
Server connects with passport-google-oauth strategy and stores user data in db
Merge branch 'auth' of https://github.com/mailcrunch/deployment into auth

Conflicts:
	server/main/config.js
	server/main/passport.js
Working on using DB data for getting and sending emails
Fixed bug with saving profile username
Merge branch 'auth' of https://github.com/mailcrunch/deployment into auth

Conflicts:
	server/main/passport.js
Got IMAP working with xoauth2
Updated email getting and sending via xoauth2 / now working
Updating Front End