We can now login and see the world!
Merge remote-tracking branch 'upstream/master'