Wrote methods for scoring
Fixed merge conflict in rake tasks