From 15e4de2f095227d6709337865a77eac8db7345d3 Mon Sep 17 00:00:00 2001
From: Dylan Camac <dylancamac@zipcoders-MacBook-Pro-5.local>
Date: Wed, 7 Feb 2018 10:24:21 -0500
Subject: [PATCH 1/3] my comment is good

---
 src/main/java/Main.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 617866b..d0ab4c6 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -2,7 +2,7 @@
  * Created by iyasuwatts on 10/17/17.
  */
 public class Main {
-
+// cool comment dude
     public static void main(String[] args ){
 
     }

From 8750537bd8ee8a631b565d3335d6e3d359e0f290 Mon Sep 17 00:00:00 2001
From: Dylan Camac <dylancamac@zipcoders-MacBook-Pro-5.local>
Date: Wed, 7 Feb 2018 13:21:28 -0500
Subject: [PATCH 2/3] save1

---
 src/main/java/Main.java | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index d0ab4c6..f89ca59 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -1,9 +1,26 @@
 /**
  * Created by iyasuwatts on 10/17/17.
  */
+import com.sun.tools.doclets.formats.html.SourceToHTMLConverter;
+
+import java.util.Scanner;
+
 public class Main {
-// cool comment dude
+// my first comment
     public static void main(String[] args ){
 
-    }
+ Scanner in = new Scanner(System.in);
+
+// get first input here
+        System.out.println("What is your name?");
+        String userName = in.nextLine();
+
+        if (userName.equals("Bob") || userName.equals("Alice")) {
+            System.out.println("Hello, " + userName);
+        } else (userName.equals()) {
+                System.out.println("You are not my friend.");
+                }
+
+
+}
 }

From 1d39a9fb0be62a26124133b4dbf502f25549a11d Mon Sep 17 00:00:00 2001
From: Dylan Camac <dylancamac@zipcoders-MacBook-Pro-5.local>
Date: Wed, 7 Feb 2018 13:33:41 -0500
Subject: [PATCH 3/3] supersaveguy

---
 src/main/java/Main.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index f89ca59..fc0ee8b 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -17,10 +17,10 @@ public static void main(String[] args ){
 
         if (userName.equals("Bob") || userName.equals("Alice")) {
             System.out.println("Hello, " + userName);
-        } else (userName.equals()) {
-                System.out.println("You are not my friend.");
-                }
+        } else  {
+            System.out.println("You are not my friend");
+        }
+        }
 
 
 }
-}