Fixing bad merge
Finished instrument overhaul
Merge branch 'master' of https://github.com/ahollenbach/GesturalMusic