diff --git a/HelloWorld.java b/HelloWorld.java
new file mode 100644
index 0000000..470a319
--- /dev/null
+++ b/HelloWorld.java
@@ -0,0 +1,6 @@
+class HelloWorld {
+    public static void main(String[] args) {
+        System.out.println("Hello World");
+    }
+}
+// Matthew Peterson
\ No newline at end of file
diff --git a/README.md b/README.md
index 7abbaf8..3e74a00 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,20 @@
-# SuperCoolProject
\ No newline at end of file
+# SuperCoolProject
+
+<<<<<<< HEAD
+Guys im having second thoughts, this might not be as cool as I thought.
+
+Matthew Peterson is pretty cool...
+
+but so is Software Engineering with Dr Ren
+=======
+Hello! Glad to see my homework repo is still being used. Maybe check out some of the other garbage I have kicking around on here?
+
+Pro tips for getting an A in Dr.Cerny's class. 
+
+    1. Study those 200 slide powerpoints like the bible
+    2. When studying go for understanding the content, not memorizing
+    3. Master git and design patterns. 
+    4. You dont realize it now, but java streams are king. 
+  
+  Do me a favor, if everyone here can tell Professor Fry congradulations on retirement, im sure she would be very greatful. 
+>>>>>>> bcb747a (Update README.md)