Merge branch 'gh-pages'
Think this might finally be working! God bless you, @kaitlin.
Merge branch 'master' into gh-pages