Github won't let me commit, so here's copy and pasting

in theory it's done.
Merge remote-tracking branch 'CS61BL-1/master'