Merge pull request #40 from tmoc/tom

Fixed username bug.
Fixed bug with logging out from room.