Pull request for final part of project

.gitignore

@@ -0,0 +1,16 @@
+*.class
+.idea/
+.project
+JavaLife.iml
+out/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*

com/laboon/JavaLife.java

@@ -1,5 +1,6 @@
 package com.laboon;
 
+
 public class JavaLife {
 
 	/**
@@ -71,6 +72,11 @@ public static void main(String[] args) {
 			System.exit(1);
 		}
 		JavaLife jl = new JavaLife(size, seed, percent, maxIterations);
+        /*try{
+            Thread.sleep(200000);
+        }catch(InterruptedException e){
+
+        }*/
 	}
 
 }

com/laboon/World.java

@@ -115,7 +115,7 @@ public World iterate() {
 	 */
 
 	public String toString() {
-		String toReturn = "  ";
+		/*String toReturn = "  ";
 		for (int j= 0; j < _size; j++) {
 			toReturn += String.valueOf(j % 10);
 		}
@@ -127,7 +127,22 @@ public String toString() {
 			}
 			toReturn += "\n";
 		}
-		return toReturn;
+		return toReturn;// this code is bad, and you should feel bad */
+
+        StringBuilder sb = new StringBuilder("  ");
+        for(int j=0; j<_size; j++){
+            sb.append(j % 10);
+        }
+        sb.append("\n");
+        for(int j=0; j<_size; j++){
+            sb.append(j%10).append(" ");
+            for(int k=0; k<_size; k++){
+                sb.append(_world[j][k].getStateRep());
+            }
+            sb.append("\n");
+        }
+        return sb.toString();
+
 	}
 
 	/**

com/laboon/WorldTest.java

@@ -0,0 +1,44 @@
+/**
+ * Created by steven on 3/31/15.
+ */
+
+package com.laboon;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+
+public class WorldTest {
+
+    @Test
+    public void testZero(){
+    	World testWorld = new World(0,25,25);
+    	String out =  testWorld.toString();
+    	assertEquals("  \n", out);
+    }
+
+    @Test
+    public void testSeed(){
+    	World testWorld = new World(2,25,25);
+    	String out =  testWorld.toString();
+    	String expected = "  01\n0 ..\n1 ..";
+    	assertEquals(expected, out);
+    }
+
+    @Test
+    public void testDead(){
+    	World testWorld = new World(2, 25, 0);
+    	String out = testWorld.toString();
+    	String expected = "  01\n0 ..\n1 ..";
+    	assertEquals(expected, out);
+    }
+
+    @Test
+    public void testAlive(){
+    	World testWorld = new World(2,25,100);
+    	String out = testWorld.toString();
+    	String expected =   "01\n0 XX\n1 XX"
+    	assertEquals(expected, out);
+    }
+
+}