added merge
Merge branch 'master' of github.com:stuycs-apcs-z/hw