diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..0a27ba4
Binary files /dev/null and b/.DS_Store differ
diff --git a/README.md b/README.md
index 7abbaf8..aebaa37 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,24 @@
-# SuperCoolProject
\ No newline at end of file
+# SuperCoolProject
+
+<<<<<<< HEAD
+Guys im having second thoughts, this might not be as cool as I thought.
+
+<<<<<<< HEAD
+Chase Caldwell
+=======
+I am loving this lab!!!
+
+Chase Caldwell 
+>>>>>>> origin/waitisthiscool
+=======
+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)
diff --git a/hello.cpp b/hello.cpp
new file mode 100644
index 0000000..9403283
--- /dev/null
+++ b/hello.cpp
@@ -0,0 +1,8 @@
+#include <iostream>
+
+int main() {
+    std::cout << "Hello, World!" << std::endl;
+    return 0;
+}
+
+
diff --git a/hello_world.cpp b/hello_world.cpp
new file mode 100644
index 0000000..5e47601
--- /dev/null
+++ b/hello_world.cpp
@@ -0,0 +1,5 @@
+#include <iostream>
+int main() {
+    std::cout << "Hello, World!" << std::endl;
+    return 0;
+}