Merge branch 'processing-2'

diff --combined SugarCubes.pde
index 36e63175061eab1b5cbff18c32a742c0f313dee2,b941bdbcc891ff3d38035917d69a1043afe82f34..9d72c5dfd49a6c0b2443d61e199ef611f82bca4c
--- 1/SugarCubes.pde
--- 2/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -26,7 -26,7 +26,7 @@@
  LXPattern[] patterns(LX lx) {
    return new LXPattern[] {        
  
-     new SineSphere(lx),
+     //new SineSphere(lx),
      //new CubeCurl(lx), 
       
      // Slee
@@@ -116,9 -116,6 +116,9 @@@
      new AbstractPainting(lx),
      new Spirality(lx),
  
 +    // Micah
 +    new Rings(lx),
 +
      // Basic test patterns for reference, not art    
      new TestCubePattern(lx),
      new TestTowerPattern(lx),