fixed login/logout issue
Merge branch 'master' of https://github.com/kloplop321/cs256

Merging.
fixed conflict