adding partial barrier into the merging.
Merge branch 'newadmm' of https://github.com/xumiao/pymonk into newadmm