added logout
Fixed merging conflicts with logout