Trying to fix logout
Fix logout
fix auth
Merge branch 'dev2' of https://github.com/mailcrunch/deployment into development

Conflicts:
	server/main/auth.js
auth fix
added style guide
Merge branch 'master' of https://github.com/mailcrunch/deployment
Add Project Summary
Merge branch 'master' of https://github.com/mailcrunch/deployment into development
Fixed localhost