Merge pull request #31 from laxrph10/kate

fixed sneaky merge conflicts
song listing in progress