adding navbar with basic user info and logout link
working on logout stuff
Merge branch 'master' of github.com:zhangmarvin/stash

Conflicts:
	website/static/js/application.js