Added logout button
Merge branch 'master' of github.com:Web-Project/athena