predictor stuff, again!
merged predictor.
Merge branch 'master' of github.com:freuk/internship

Conflicts:
	simulation/pyss/src/predictors/predictor.py
	simulation/pyss/src/predictors/predictor_clairvoyant.py
	simulation/pyss/src/predictors/predictor_from_think_time.py
	simulation/pyss/src/predictors/predictor_tsafrir.py