New version of logic
Merge branch 'logic_test' of https://github.com/TheiaRobo/Theia into logic_test