Revert "Revert "Merge branch 'master' of https://github.com/victly/COGS187AFINAL""

This reverts commit e409c7e14be3b3c4fb4ab9ab9e053de6d925ebd5.