updates while teaching
Merge branch 'master' of github.com:williamstein/2013-308