pre-class slide edits
Merge branch 'working' of github.com:jcstaff/ejava-javaee into working