Marginalization implemented with tests
Merge branch 'master' of https://github.com/mbaumBielefeld/PRIMO