Merge branch 'master' of https://github.com/b-stone/Decompositions-M2

Conflicts:
Decompositions.m2
minor edits