Merge pull request #3 from SethKips/master

More work on lobby UI
Merge remote-tracking branch 'upstream/master'
Began Work on a World Map UI

Added a test button to main menu to get to map
Added movement on map
Added an NPC to center of map who will let you into the shop if you are
-logged in