resolving conflict
Merge branch 'master' of https://github.com/madaan/delic
ScoreAssigner class
Merge branch 'master' of https://github.com/madaan/delic