jchang19 Merge branch 'main' of https://github.com/jchang19/cos426-final-proj