Fixes

Allows for repeated songs
Merge branch 'temp' into gh-pages