Marge lab2part1 changes to main

Michael Christensenrequested to merge
mchris-lab2 into main

Revert "Merge branch 'mchris-lab2' of gitlab.cs.washington.edu:mchris02/cse451-mchris02 into mchris-lab2"

This reverts commit 5e724244

Merge request reports