a new combination method
Merge branch 'master' of https://github.com/NoahCarnahan/plagcomps
Merge branch 'master' of https://github.com/NoahCarnahan/plagcomps
new ways of combining extrinsic + intrinsic