platzi · esmeraldalopez · Dec 27, 2015 · Dec 27, 2015 · Dec 27, 2015 · Dec 27, 2015
diff --git a/commits.txt b/commits.txt
@@ -0,0 +1,35 @@
+commit 22381131bda79fed958846d0b27676d3be7e5900
+Author: Esme Lopez <[email protected]>
+Date:   Sat Dec 26 19:27:22 2015 -0600
+
+    Sitios
+
+commit 154167e0c786e97f1eea0205797f7627812e250f
+Author: Esme Lopez <[email protected]>
+Date:   Sat Dec 26 19:26:20 2015 -0600
+
+    Descriocion de background
+
+commit 9cad033f9334c2edbdf92204d8cf8d5b3832671c
+Author: Esme Lopez <[email protected]>
+Date:   Sat Dec 26 19:24:50 2015 -0600
+
+    Redes sociales
+
+commit 6ff427b130d52b300501918dbe33f11bbb019da7
+Author: Esme Lopez <[email protected]>
+Date:   Sat Dec 26 19:20:49 2015 -0600
+
+    Perfil (decripcion)
+
+commit d2b059f03079ced3ccaf375576a9b7d56a921ad0
+Author: Esme Lopez <[email protected]>
+Date:   Sat Dec 26 19:18:44 2015 -0600
+
+    Foto y nombre de perfil
+
+commit ace00f4c8c54886fd1dd2b6a06aaba5169a0f988
+Author: Esme Lopez <[email protected]>
+Date:   Sat Dec 26 19:12:09 2015 -0600
+
+    archivos base
diff --git a/images/comunidad.jpeg b/images/comunidad.jpeg
diff --git a/images/git.jpg b/images/git.jpg
diff --git a/images/mejorandola.png b/images/mejorandola.png
diff --git a/index.html b/index.html
@@ -1,16 +1,20 @@
-<!DOCTYPE html> 
+
+<!DOCTYPE html>
+
 <html lang="es">
 <head>
 <!-- Basic Page Needs
  ================================================== -->
-  <title>Ejercicio 1 - #mejorandogit</title>
+
+  <title>ESME LOPEZ</title>
+
   <meta charset="utf-8" />
   <meta name="description" content="Mejorandogit - Cursos Mejorando.la">
   <meta name="author" content="Mejorando.la" />
   <meta name="robots" content="all">
 
-<!-- Mobile Specific Metas
- ================================================== --> 
+<!-- Mobile Specific Metas-->
+
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
@@ -32,27 +36,27 @@
     <section class="sidebar_information">
       <div class="sidebar_userimage">
          <!-- 1º Commit Tu nombre y foto -->
-        <img src="images/git.jpg">
+        <img src="https://avatars1.githubusercontent.com/u/13700129?v=3&s=460">
         <h1 class="sidebar_information_title">
-          Escribe tu nombre
+          Esme López
         </h1>
       </div>
       <div class="comunidad-autoria">
         <div class="nombre">
           <!-- 2º Commit - Tu perfil Web -->
-          <p>Escribe tu perfil web</p>
+          <p>Desarrollo Web</p>
         </div>
       </div>
     </section>
     <ul>
       <li>
-        <a href="#" target="_blank">
+        <a href="https://www.facebook.com/esmeralda.le.MAGC" target="_blank">
           <!-- 3º Commit - Redes Sociales -->
           <p>Facebook</p>
         </a>
       </li>
       <li>
-        <a href="#" target="_blank">
+        <a href="https://twitter.com/eetsmee" target="_blank">
           <p>Twitter</p>
         </a>
       </li>
@@ -62,7 +66,7 @@ <h1 class="sidebar_information_title">
         </a>
       </li>
       <li>
-        <a href="#" target="_blank">
+        <a href="https://github.com/esmeraldalopez" target="_blank">
           <p>GitHub</p>
         </a>
       </li>
@@ -79,12 +83,10 @@ <h3>¡Hola! Bienvenido</h3>
     <div class="bloque">
       <!-- 5º Commit - Tu portafolio -->
       <h3>Tu portafolio</h3>
-      <a href="#"><p>Nombre de tu sitio</p></a>
-      <a href="#"><p>Nombre de tu sitio</p></a>
-      <a href="#"><p>Nombre de tu sitio</p></a>
-      <a href="#"><p>Nombre de tu sitio</p></a>
+      <a href="#"><p>Proximamente...</p></a>
+
     </div>
   </div>
-    
+
 </body>
-</html>
+</html>
diff --git a/propuesta.txt b/propuesta.txt
@@ -0,0 +1 @@
+Esta es una propuesta de esme para el proyecto original de mejorandogit
diff --git a/stylesheets/normalize.css b/stylesheets/normalize.css
diff --git a/stylesheets/styles.css b/stylesheets/styles.css
@@ -1,17 +1,29 @@
 body
 {
+<<<<<<< HEAD
+ background: black;
+=======
  background: rgb(22, 21, 20);
+>>>>>>> upstream/master
  font-size: 16px;
 }
 
 a
 {
   text-decoration: none;
+<<<<<<< HEAD
+}12   
+
+ul
+{
+  margin: 40% 0 0% 0%;
+=======
 }
 
 ul
 {
   margin: 20% 0 0% 0%;
+>>>>>>> upstream/master
 }
 
 ul li
@@ -21,7 +33,11 @@ ul li
 
 ul li a
 {
+<<<<<<< HEAD
+ text-decoration: none;
+=======
  text-decoration: none; 
+>>>>>>> upstream/master
 }
 
 ul li a p
@@ -95,7 +111,11 @@ div.sidebar_userimage img
   border-radius: 26px;
   width: 75px;
   padding: 7px;
+<<<<<<< HEAD
+  border: 1px solid #ccc;
+=======
   border: 1px solid #ccc; 
+>>>>>>> upstream/master
 }
 
 div.comunidad-autoria
@@ -129,7 +149,11 @@ display: inline-block;
 vertical-align: top;
 padding: 0;
 margin: 0% 33%;
+<<<<<<< HEAD
+font-size: 27px;
+=======
 font-size: 15px;
+>>>>>>> upstream/master
 text-align: center;
 }
 
@@ -140,10 +164,17 @@ div.nombre p
 
 div.layout-principal
 {
+<<<<<<< HEAD
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+=======
   position: absolute; 
   top: 0; 
   right: 0; 
   bottom: 0;  
+>>>>>>> upstream/master
   overflow-x: auto;
   width: 55%;
   padding: 0% 6.5%;
@@ -158,4 +189,8 @@ div.bloque p
 {
   color: rgb(255, 255, 255);
   line-height: 1.9em;
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> upstream/master
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Esta es una propuesta de esme para el proyecto original de mejorandogit