diff --git a/.classpath b/.classpath
index c3151cc0..770a4f99 100644
--- a/.classpath
+++ b/.classpath
@@ -4,63 +4,63 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.gradle/gradle.log b/.gradle/gradle.log
index 3b444d72..9ef93fb7 100644
--- a/.gradle/gradle.log
+++ b/.gradle/gradle.log
@@ -34,4 +34,8 @@ Note: Recompile with -Xlint:unchecked for details.
BUILD SUCCESSFUL
+<<<<<<< HEAD
Total time: 9.983 secs
+=======
+Total time: 13.559 secs
+>>>>>>> 16825054b0ee5f4bff3059db84297822fc100352
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 66a172ff..24631e36 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
#
-#Sun Jul 12 11:29:42 EDT 2015
+#Mon Jul 13 00:27:19 EDT 2015
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve