Added update_score func to Server
Fixing merge conflicts