did some stuff
Merge remote-tracking branch 'origin/master'
got soundpool to work