diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..447c81d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+node_modules/
+*.log
+*.cache
diff --git a/file1.txt b/file1.txt
index e69de29..ebaed77 100644
--- a/file1.txt
+++ b/file1.txt
@@ -0,0 +1 @@
+Prueba de busqueda para github
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..fab7dc9
--- /dev/null
+++ b/index.html
@@ -0,0 +1,40 @@
+<<<<<<< Updated upstream
+new content
+=======
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Portfolio</title>
+</head>
+<body>
+  <nav>
+    <ul>
+      <li><a href="#">Homesad</a></li>
+      <li><a href="#">About</a></li>
+      <li><a href="#">Contact</a></li>
+    </ul>
+  </nav>
+
+  <h1>Welcome To Ironhacker's Page</h1>
+
+  <section>
+    <h2>Things I Like</h2>
+    <ul>
+      <li>Fill</li>
+      <li>This</li>
+      <li>In</li>
+    </ul>
+  </section>
+
+  <section>
+    <h2>Things I Don't Like</h2>
+    <ul>
+      <li>Fishss</li>
+      <li>Heights</li>
+      <li>Wind</li>
+    </ul>
+  </section>
+</body>
+</html>
+>>>>>>> Stashed changes
diff --git a/style.css b/style.css
new file mode 100644
index 0000000..f3197a9
--- /dev/null
+++ b/style.css
@@ -0,0 +1,4 @@
+h2 {
+    color: aqua;
+    text-align: center;
+}
\ No newline at end of file
