cutting some if statements

.idea/workspace.xml

@@ -236,7 +236,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542848238278" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542954631305" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />

src/main/java/com/zipcodeconway/ConwayGameOfLife.java

@@ -81,10 +81,7 @@ public class ConwayGameOfLife {
         int count = neighbors(row, col, world);
         int returnValue = 0;
 
-        if (count == 3) {
-            returnValue = 1;
-        }
-        if (world[row][col] == 1 && count == 2){
+        if (count == 3 || (world[row][col] == 1 && count == 2)) {
             returnValue = 1;
         }
 
@@ -111,7 +108,7 @@ public class ConwayGameOfLife {
                     j = 0;
                 }
 
-                if (world[i][j] == 1 &&(!(i == row && j == col))) {
+                if (world[i][j] == 1 && (!(i == row && j == col))) {
                     count++;
                 }