Removed all non-location and location-list annotations.
Fixed the estimated time calculation.
Added a query splitting script.
Merge branch 'master' of gh:solowandererY2K/cse454-location

Conflicts:
	src/cli/Extractor.java