Merge pull request #7 from hubert667/Hubert1

Hubert1
Merge pull request #8 from hubert667/Hubert1

paths to datasets
Merge branches 'origin' and 'master' into Anna
added more options to main.py
Merge remote-tracking branch 'origin/Anna' into Hubert1

Conflicts:
	src/scripts/main.py
	src/scripts/queryRanker.py