Improved song search and page
Merge branch 'master' of https://github.com/Aknoxlor/MadMusicMath