# WARNING: head commit changed in the meantime

Merge branch 'master' of
https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git

src/backend/Simulator.java

@@ -122,6 +122,9 @@ public class Simulator extends Thread {
 		
         int[][] newWorld = new int[getWidth()][getHeight()];
         
+        
+        
+
         // Apply Game of Life rules
         //for (int x = 0; x < getWidth(); x++) {
         //    for (int y = 0; y < getHeight(); y++) {