Merge branch 'gh-pages'
fixed time play
fixed song selection
Merge branch 'master' into gh-pages