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

Conflicts:
	3/.DS_Store