Updating homework
Merge branch 'master' of https://github.com/stuycs-apcs-z/hw

Conflicts:
	3/.DS_Store