some progress on new algorithm
solving conflicts
Merge branch 'master' of https://github.com/trueter/HTW-BV