Clean up diff
Merge branch 'master' of https://github.com/pam-anderson/JamsMusicPlayer