Merge pull request #36 from tmoc/tom

Made username persist and show up for other users.
Fixed username bug.