after Japan
Merge branch 'master' of https://github.com/wrathematics/pbd-tutorial
reconciling "after Japan" with Drew's changes in the meantime.

r' of https://github.com/wrathematics/pbd-tutorial