refaactor and looping
Merge pull request #44 from reidbaker/playlist_refactor

refactor and looping
Merge branch 'master' into menu_refactor