Merge branch 'master' into tobysegaran

Conflicts:
	SugarCubes.pde

diff --cc SugarCubes.pde
index ca6a1c870f48c71043145cc94dd869fd9f8c1e33,a7210f3054b4504807939381d72e82559c6db3be..bb55e6fea0ca40c693dc7169ca9d9877d17cd275
--- 1/SugarCubes.pde
--- 2/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -34,19 -36,18 +36,19 @@@ LXPattern[] patterns(GLucose glucose) 
      new Psychedelia(glucose),
      new CubeEQ(glucose),
      new PianoKeyPattern(glucose),
 -    new WarmPlasma(glucose),
 -    // new FireTest(glucose),
 -    // new SineSphere(glucose),
 +    new GlitchPlasma(glucose),
 +    new FireEffect(glucose),
 +    new StripBounce(glucose),
 +    new SoundCubes(glucose),
-     //new SineSphere(glucose),
      
      // Basic test patterns for reference, not art    
- //    new TestCubePattern(glucose),
- //    new TestHuePattern(glucose),
- //    new TestXPattern(glucose),
- //    new TestYPattern(glucose),
- //    new TestZPattern(glucose),
- //    new TestProjectionPattern(glucose),
+     new TestCubePattern(glucose),
+     new TestTowerPattern(glucose),
+     new TestProjectionPattern(glucose),
+     // new TestHuePattern(glucose),
+     // new TestXPattern(glucose),
+     // new TestYPattern(glucose),
+     // new TestZPattern(glucose),
  
    };
  }