diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Torvalds.md b/Torvalds.md
new file mode 100644
index 0000000..3b8a378
--- /dev/null
+++ b/Torvalds.md
@@ -0,0 +1,7 @@
+# We are Torvalds
+
+## Members
+Dylan 
+Dylan
+Sulley
+Jeffery
diff --git a/hello.py b/hello.py
index 39cf599..6862abd 100644
--- a/hello.py
+++ b/hello.py
@@ -1,4 +1,8 @@
 #!/usr/bin/env python
 
 print("Hello World!")
-print("modification")
\ No newline at end of file
+<<<<<<< HEAD
+print("Added change")
+=======
+print("modification")
+>>>>>>> 6afd2e32ae9703b912998eb4f3ea0a11fbcdbd5a