merge conflicts resolved

Author: NicolasArayaB

.learn/assets/baby.jpg

@@ -1,3 +1,7 @@
+---
+tutorial: "https://www.youtube.com/watch?v=RffCSMXgWFc"
+---
+
 # `04` Class Selector
 
 There are many ways to select HTML elements to apply styles to them, so far we have only use the `tag` selector, lets talk about the `.class` selector:

.learn/resets/04.1-Combined-Rules/styles.css

@@ -1,3 +1,7 @@
+---
+tutorial: "https://youtu.be/watch?v=uQS5QeEE-B4"
+---
+
 # `04.1` Combined Rules
 
 CSS files take space on your server and also take time to download (like everything); it is yet another text document that the browser has to download before rendering the page, which is why is important to keep the CSS document as small as possible.

.learn/resets/04.2-Apply-several-classes/index.html

@@ -1,8 +1,20 @@
 .myBox {
 	width: 50px;
 	height: 50px;
+<<<<<<< HEAD
 	padding: 10px 190px 50px 30px;
 	/* padding: 10px 30px 50px 190px; */
 	background: rgb(189, 189, 189) url(https://assets.breatheco.de/apis/img/funny/baby.jpg) no-repeat 100px;
+=======
+	padding-top: 10px;
+	padding-left: 30px;
+	padding-right: 190px;
+	padding-bottom: 50px;
+
+    background: rgb(189, 189, 189);
+	background-image: url(https://assets.breatheco.de/apis/img/funny/baby.jpg);
+	background-position-x: 100px;
+	background-repeat: no-repeat;
+>>>>>>> e836081d192c7c4d33e07bacbc80c8e63f74d6c3
 	background-size: contain;
 }

.learn/resets/04.3-id-Selector/index.html

@@ -1,3 +1,7 @@
+---
+tutorial: "https://www.youtube.com/watch?v=da4tJDx48CY"
+---
+
 # `04.2` Apply several classes
 
 We have prepared a small CSS Stylesheet that contains the CSS styles to replicate poker cards.

.learn/resets/04.3-id-Selector/styles.css

@@ -1,4 +1,4 @@
-# `04` Selector de clase
+# `04.3` Selector de ID
 
 También puedes seleccionar un elemento por su `#id` y aplicarle estilos.
 

.learn/resets/05-Specificity/index.html

@@ -1,4 +1,8 @@
-# `04` Class Selector
+---
+tutorial: "https://www.youtube.com/watch?v=9906LCSQJ8M"
+---
+
+# `04.3` The ID CSS Selector
 
 You can also select an element by `#id` and apply stiles to it.
 

.learn/resets/05-Specificity/styles.css

@@ -1,3 +1,7 @@
+---
+tutorial: "https://www.youtube.com/watch?v=3JxXkhxyAnI"
+---
+
 # `05` Specificity
 
 When creating a CSS document, you need to start from the most generic selector and end with the most specific ones, that is the way CSS works.