Merge pull request #21 from soundsplosion/sp

Fixed ids so it doesn't go 0, 2, 4, 6, ...; removed demo song