Begins editing userSchema with not-null testing
Edits CSS for enable/disable toggling
Begins updating schema tests with not-null requirement
Add passport modules for user authentication
Fixes tests for requiring email as an input field when writing to DB
Merge pull request #151 from jamesongamble/userSchema

Fixes tests for requiring email in user schema
Updates travis.yml so my keys get cleared after each continuous deployment
Implement user authentication using Google OAuth
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp into passport

Conflicts:
	server/database/dbSchema.js
Merge pull request #154 from ryojiosawa/google-oauth
Merge pull request #155 from kmeurer/master

Update proximity api with new routes, complete with testing
Merge pull request #153 from jamesongamble/travisFix

Fix travis to clear out SSH keys after each successful continuous deployment
Refactors for new authentication routes
geolocation changes
spec file changes
fixing merge conflicts
enable ng-cordova
reverting user specs
Removes unnecessary methods for login/signup
Merge pull request #162 from jamesongamble/authRoutes

Refactor for new authentication routes