changed stuff but need to fix points
Merge branch 'master' of github.com:stuycs-apcs-z/final-pd3-angela-michelle-td