Re pandocing stuff
repandocing
Merge branch 'master' into gh-pages