Merge branch 'master' of https://github.com/sugarcubes/SugarCubes

Conflicts:
	_Mappings.pde

diff --cc AlexGreen.pde
index 6b076f63f03f1c0ec3d4c3d18bd58ded14c0249e,6ee9a393f5fa00621d2516bf15aca1b8985d5868..e240f7db9d08bf65ad69f76d6c2fd14734c9084c
mode 100755,100644..100644
--- 1/AlexGreen.pde
--- 2/AlexGreen.pde
+++ b/AlexGreen.pde

diff --cc SugarCubes.pde
index f9616b81b3bad96bf49bd55d4960c7beb08c4609,84a311a54675ba2a00c36c2283a41a0fe36b1e50..893152f31148221424950f696c5cad306abb4f04
--- 1/SugarCubes.pde
--- 2/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -26,10 -26,10 +26,12 @@@
  LXPattern[] patterns(GLucose glucose) {
    return new LXPattern[] {
  
 -    
 +    new SineSphere(glucose),
 +     new CubeCurl(glucose),
 +
      // Slee
+     // new MidiMusic(glucose),
+     new Pulley(glucose),
      new Swarm(glucose),
      new ViolinWave(glucose),
      new BouncyBalls(glucose),

diff --cc _Mappings.pde
index 3f6756a08c56cd6522d38db47adc757f4d689d56,9ff78ba00a37f45aa3afbbc76e0734eb3abaee8f..a16c46737870165bc69a06840bcf4089463476c1
--- 1/_Mappings.pde
--- 2/_Mappings.pde
+++ b/_Mappings.pde
@@@ -120,7 -114,10 +120,7 @@@ for (StaggeredTower st : scubes) 
      towerList.add(new Tower(tower));
    }
  
-  return new Model(towerList, cubes, bassBox, speakers);
 -  for (Cube cube : singleCubes) cubes[cubeIndex++] = cube;
 -  for (Cube cube : dcubes)            cubes[cubeIndex++] = cube;
 -
+   return new Model(towerList, cubes, bassBox, speakers);
  }
  
  /**