Finished the score functionality
Merge branch 'issue_5' into dev_1.0