more mergeconflicts
more mergeconglifst
ofSoundObject::setInput now virtual
ofSoundMixer initing master params correctly
ofSoundMixer: remover cout