compiles almost work (makes objects, links fail)
incremental commit, back to compiling
keep the changes after pending merge
more incremental work
resolving conflicts
Merge branch 'consensusThresholding' into DBScan