calculate distance
Merge remote-tracking branch 'origin/master' into Hubert1

Conflicts:
	src/scripts/queryRanker.py
	src/scripts/queryRankers.py
Merge pull request #6 from hubert667/Hubert1

calculate distance