lint
Merge branch 'plot-trajectories' into barycentric-rendering