merged map editor, sim test, and evo simulation, refactored some stuff
merge
merge
merged controller stuffff
merge again