revisions for camera ready
repo changes

Merge branch 'master' of https://github.com/mcfrank/teaching