Merge pull request #78 from biversen21/develop

adds dat gui
Merge upstream/feature/new-globe into god-mode
fix broken merge
Merge pull request #79 from TGVarik/god-mode

merging in god-mode
adds to gui and removes flags
fixes merge conflicts