final score mess
ready to merge back with gh-pages
Merge branch 'final-score-mess' into gh-pages