naming things
Merge pull request #1 from seansay/dev_old_song_never_play

naming things.