new scoring function
fix merge conflict
Merge pull request #13 from adamreis/better-score-function

Better score function