Finished parts 1 and 2 of the hw
Merge branch 'master' of github.com:stuycs-apcs-z/hw