Return data rather than writing to file, so we can load test data too.
Merge branch 'master' of github.com:grantdhunter/cmput466-music