eval update
Merge branch 'master' of https://github.com/omertripp/predictive
merge what?
conflict fixed