Score displaying changed
Score system changed
Mege conflicts solved