Marge lab2part1 changes to main
Revert "Merge branch 'mchris-lab2' of gitlab.cs.washington.edu:mchris02/cse451-mchris02 into mchris-lab2"
This reverts commit 5e724244
Revert "Merge branch 'mchris-lab2' of gitlab.cs.washington.edu:mchris02/cse451-mchris02 into mchris-lab2"
This reverts commit 5e724244