Merge branches 'origin' and 'master' into Anna
added more options to main.py
Saving other parameters on disc
Merge remote-tracking branch 'origin/Anna' into Hubert1

Conflicts:
	src/scripts/main.py
	src/scripts/queryRanker.py
error correction
Merge pull request #9 from hubert667/Hubert1

Hubert1