Sort songs by category
Playback options for songs
Fix song options styling bugs
Fix playback bugs
Fix conflicts
Merge pull request #16 from elihart/songs

Songs