implemented scoreboard
Merge branch 'develop'