Merge branch 'gh-pages'
adjusting players
Merge branch 'master' into gh-pages