Adding thing that shows if you're logged in
Fixing merge
Blah