Moved second score file into the only score file

This is what source control is for :P
Merge branch 'master' of github.com:thecodemaiden/11-752-project
Updated scoring code