Merge branch 'master' of /Users/ernestoestrada/IdeaProjects/PPL-Fall-2018 with conflicts.

Jive/IntPair.txt

@@ -0,0 +1,8 @@
+public class IntPair
+{
+  public int first, second;
+
+  public IntPair( int a, int b )
+  {  first = a;  second = b;  }
+
+}