Merge conflicts
Merge conflicts
Merge branch 'facets' of github.com:tdhock/animint into facets
Restructure to handle coord_fixed and free spacing