Basic Music Synthesis Demo issue #8 - functional GUI / fix merge conflict

authors: @RapidRage @mlindsay56
moderators: @CARammelkamp
~claimed 400 (280 functional GUI / 120 fix merge conflict)