Made the logout actually logout
Merge branch 'master' of https://github.com/joubin/CSC191

Conflicts:
	frontend/js/directives.js