please work
hi
afj
hw

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

Conflicts:
	1/hlebowicz_thomas/01-knights-queens/Knight.java
	1/kagno_dmitriy/01-knights/Knights.java
	2/hegazy_omar/.gitignore
	3/.DS_Store
	3/burghard_anne_claire/01-Knights/Knights.java