Commit with final revisions of some pair-programming work on w2d1