linting edits
fixing merge conflict in loginController
fixing merge conflict in routes.js
okMerge branch 'dev' of https://github.com/GoOutside/master into dev
Merge branch 'dev' of https://github.com/GoOutside/master into dev
adding working auth and signout route