query finished
Merge branch 'sqfile'

Conflicts:
	src/main/scala/invertedIndex.scala