Now testing on test data.
Merge branch 'master' of github.com:grantdhunter/cmput466-music