Merge branch 'gh-pages'
Minor fix to adding player name feature
Merge branch 'master' into gh-pages