implemented WebAudioAPI oscillator in a semi-usable way
fixed merge conflict in main.js