fixed googleId / password discrepency
some login fixes
Merge branch 'master' of github.com:CompSciClub/Hopkins-Planner

Conflicts:
	routes/AuthCallback.js