acsrobotics · Matthewacon · Feb 16, 2016 · Feb 16, 2016 · Feb 17, 2016
diff --git a/.gitignore b/.gitignore
@@ -25,15 +25,17 @@ gradle-app.setting
 # Eclipse
 *.pydevproject
 .metadata
-bin/
 tmp/
 *.tmp
 *.bak
 *.swp
 *~.nib
 local.properties
-.settings/
-.loadpath
+//For now, since the two repos are improperly jammed into one, use regex matching to get rid of the excess Eclipse folders in the repo. Once the repos have been seperated, remove the "*" regex matcher.
+*.settings/
+*.loadpath
+*target/
+*bin/
 
 # Eclipse Core
 .project

diff --git a/Raider/README.md → INFO.md b/Raider/README.md → INFO.md
diff --git a/Raider/.classpath b/Raider/.classpath
diff --git a/Raider/.gitignore b/Raider/.gitignore
diff --git a/Raider/.project b/Raider/.project
diff --git a/Raider/.settings/org.eclipse.jdt.core.prefs b/Raider/.settings/org.eclipse.jdt.core.prefs
diff --git a/Raider/.settings/org.eclipse.m2e.core.prefs b/Raider/.settings/org.eclipse.m2e.core.prefs
diff --git a/Raider/src/org/usfirst/frc/team4716/robot/OI.java b/Raider/src/org/usfirst/frc/team4716/robot/OI.java
diff --git a/Raider_Server/.classpath b/Raider_Server/.classpath
diff --git a/Raider_Server/.project b/Raider_Server/.project
diff --git a/Raider_Server/.settings/org.eclipse.jdt.core.prefs b/Raider_Server/.settings/org.eclipse.jdt.core.prefs
diff --git a/Raider_Server/.settings/org.eclipse.m2e.core.prefs b/Raider_Server/.settings/org.eclipse.m2e.core.prefs
diff --git a/Raider_Server/bin/lib/json-20151123.jar b/Raider_Server/bin/lib/json-20151123.jar
diff --git a/Raider_Server/bin/server/FileServer.class b/Raider_Server/bin/server/FileServer.class
diff --git a/Raider_Server/config.json b/Raider_Server/config.json
diff --git a/Raider_Server/pom.xml b/Raider_Server/pom.xml
diff --git a/Raider_Server/src/lib/json-20151123.jar b/Raider_Server/src/lib/json-20151123.jar
diff --git a/Raider_Server/src/server/FileServer.class b/Raider_Server/src/server/FileServer.class
diff --git a/Raider_Server/src/server/FileServer.java b/Raider_Server/src/server/FileServer.java
diff --git a/Raider_Server/target/classes/.gitignore b/Raider_Server/target/classes/.gitignore
diff --git a/Raider_Server/target/classes/lib/json-20151123.jar b/Raider_Server/target/classes/lib/json-20151123.jar
diff --git a/Raider_Server/target/classes/server/FileServer.class b/Raider_Server/target/classes/server/FileServer.class
diff --git a/Raider_Server/test.json b/Raider_Server/test.json
diff --git a/Raider/build.properties → build.properties b/Raider/build.properties → build.properties
diff --git a/Raider/build.xml → build.xml b/Raider/build.xml → build.xml
diff --git a/Raider/pom.xml → pom.xml b/Raider/pom.xml → pom.xml