diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..546d4d2f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+#ignorar carpetaSecreta
+carpetaSecreta/
+
+#ignorar archivo configuracion
+configuracion
\ No newline at end of file
diff --git a/carpetaSecreta/password b/carpetaSecreta/password
deleted file mode 100644
index 1fa4b800..00000000
--- a/carpetaSecreta/password
+++ /dev/null
@@ -1 +0,0 @@
-pass: 1234
\ No newline at end of file
diff --git a/configuracion b/configuracion
deleted file mode 100644
index 81f237ad..00000000
--- a/configuracion
+++ /dev/null
@@ -1,2 +0,0 @@
-PC:local
-URL:localhost
\ No newline at end of file
diff --git a/diarioAlumno/diarioA.txt b/diarioAlumno/diarioA.txt
index db23ecbd..1f8e80e8 100644
--- a/diarioAlumno/diarioA.txt
+++ b/diarioAlumno/diarioA.txt
@@ -1 +1,4 @@
-Aquí viene tu diario
\ No newline at end of file
+Aquí viene tu diario
+Aqui agregamos rama 'nueva-funcionalidad'
+primer commit 
+segundo commit 
\ No newline at end of file