fixed diffs and code view
Merge branch 'diffs' of github.com:Cal-CS-61A-Staff/ok into diffs