score
fix merge conflicts
Merge pull request #26 from Eye-Static/stephens

Updated files with score function.