Merge pull request #180 from Cal-CS-61A-Staff/diffs

Diffs