my old solution to hw1
Merge branch 'master' of https://github.com/sl3760/WebSearchEngine

Conflicts:
	.DS_Store
	hw1/.DS_Store
	hw1/instructor/.DS_Store
	hw1/instructor/src/.DS_Store
	hw1/instructor/src/edu/.DS_Store