Merged New Score Keeper

Ugh I don't like the conflict resolution thingy.  I don't know what
changes were lost.  Sorry :-(