Some random changes.
Semester end wrapup.
Merge branch 'master' of oc-git:oc-cs240/f2012