fix scorecard merge conflicts
Merge branch 'master' of github.com:jdubjdub/boxscores