first commit
Merge branch 'master' of https://github.com/cs1384/WSE_homework2

Conflicts:
	src/edu/nyu/cs/cs2580/QueryHandler$1.class
	src/edu/nyu/cs/cs2580/Ranker$1.class
	src/edu/nyu/cs/cs2580/SearchEngine$1.class
	src/edu/nyu/cs/cs2580/TestParse2.class
conf