score changes
Merge branch 'score' of https://github.com/mshem/155bFinal into score