tweaks
Refactor to submodules
Start of macros
Merge branch 'master' into lifted
updating scala version
Fixing conflicts
Build settings