merged
Merge branch 'newadmm' of https://github.com/xumiao/pymonk into newadmm
Merge branch 'newadmm' of https://github.com/xumiao/pymonk into newadmm
fixing merging bug in ADMM algorithm.