added logout and nav menu
removed redundant js, small changes to controller for logout
Merge branch 'master' into chat

Conflicts:
	public/css/application.css
	public/js/chat.js
created starters for error handling on login