Bug fix ++
Merge branch 'master' of https://github.com/tkarper/nlab
Implemented ConMat2, a better ConMat