Edits from lecture.
Merge branch 'master' of ocprof:oc-cs340/s2014