Merge remote-tracking branch 'refs/remotes/origin/master'

I don't think this will cause problems? Not sure where the conflict is because I don't understand how to use git.

sine feedback.scd

@@ -24,4 +24,7 @@
 }.play;
 )
 
-{WeaklyNonlinear.ar(SinOsc.ar(70), Impulse.kr(1), ratex:0.1, ratey:20, freq:440, initx:10 + SinOsc.kr(40), inity:20 + SinOsc.kr(20), alpha:SinOsc.kr(1), xexponent:0, beta:0, yexponent:0).dup}.play;
+{WeaklyNonlinear.ar(SinOsc.ar(70), Impulse.kr(1), ratex:0.1, ratey:20, freq:440, initx:10 + SinOsc.kr(40), inity:20 + SinOsc.kr(20), alpha:SinOsc.kr(1), xexponent:0, beta:0, yexponent:0).dup * 0.2}.play;
+
+
+{BHiPass.ar(WeaklyNonlinear2.ar(LFSaw.ar(5000 + SinOsc.kr(200), 1 + SinOsc.kr(0.1)), Dust.ar(1), 0.01, 10, 200, 0, 0, 0.01, 10, 2), 500 + SinOsc.kr(200)).dup}.play