Logout feature working
merge conflicts