in class updates
Merge branch 'master' of https://github.com/pal25/eecs314
merge in pat's additions