Simplified soundboard app, still some work to do
Merge remote-tracking branch 'upstream/master'