Minor Typographical fixes
Merge branch 'master' of https://github.com/jbfitz/EECS405
Merging Changes part 1
Merging changes part 2. Submission to Meral