Fun colors are more fun now
Move trochoid along the axis
Merge branch 'master' into gh-pages