A merge of finish-modularization with multi-core, which I'd already done for the most part, except on the multi-core-refactored branch. @jvansomeren, please check if you have uncommitted/pushed changes on your local multi-core branch first and commit those, then this can be merged.
A merge of
finish-modularizationwithmulti-core, which I'd already done for the most part, except on themulti-core-refactoredbranch. @jvansomeren, please check if you have uncommitted/pushed changes on your local multi-core branch first and commit those, then this can be merged.