edits
single command to make pdf
Merge branch 'master' into gh-pages