Merger complete, editor is now a gamestate, switchable

hello goodbye