mergeconflicts fixed
Merge branch 'master' of https://github.com/Torvin1/polytopelizer