fixed merge conflict

Author: helgakern

README.md

@@ -4,35 +4,40 @@ In this repository, you will find content and resources related to the practical
 
 To add content or request a change, please branch out by following these guidelines:
 
-* If you are adding a new section, start your branch saying section-course/ + the course and links you are adding, such as: section-course/html-css-freecodecamp.
-* If you are only updating or requesting an update to a section, start your branch with section/ + what you're updating, as per: section/updating-introduction.
-* All the images should be added under the folder images-web-dev-path.
-* The Pull Requests (PR) should follow a similar structure we can see on the picture below, wich includes a brief description of the PR:
+- If you are adding a new section, start your branch saying section-course/ + the course and links you are adding, such as: section-course/html-css-freecodecamp.
+- If you are only updating or requesting an update to a section, start your branch with section/ + what you're updating, as per: section/updating-introduction.
+- All the images should be added under the folder images-web-dev-path.
+- The Pull Requests (PR) should follow a similar structure we can see on the picture below, wich includes a brief description of the PR:
 
 <br />
 
 ![PR example](/images-web-dev-path/pr-example.png)
 
 <br />
 
-This is a video that explains a little bit how to start collaborating with the project: 
+This is a video that explains a little bit how to start collaborating with the project:
 
 [Start Collaborating](https://www.loom.com/share/fbe2c01a963c4885815391d671f35321?fbclid=IwAR1bI2VdRntQhK37dpRI3LS_YPWDmVk-n8yLTYqKlq-v7QP6cNgkaP5Nqe0)
 
+These are the videos that explain in detail how to branch out and submit a PR:
+
+- [Branching out from an up to date master](https://www.loom.com/share/77c3bea45d86428a86c897ac3ccaacc4)
+- [Creating the PR with the first commit](https://www.loom.com/share/04e326b873db4af7a4ce86c74183d554)
+- [Fixing the PR title](https://www.loom.com/share/58feae54c4d04a2e908d5fe41dc262e9)
+- [Adding the description and selecting the reviewers](https://www.loom.com/share/bf775cb7503c42129ab5f7715b094c53)
+- [Merging the PR](https://www.loom.com/share/de0eaa9cdcd34d8bac491cd8955f4883)
+
 <br />
 
-## Courses and Certifications ##
+## Courses and Certifications
 
-* **Git** 
-    * [Git Official Basics](https://git-scm.com/book/en/v2)
-    * [Git Basis by Colt Steele](https://www.youtube.com/watch?v=USjZcfj8yxE&t=14s)
-    * [Git and GitHub for Beginners - Crash Course by freeCodeCAmp](https://www.youtube.com/watch?v=RGOj5yH7evk)
-    * [GitHub Tutorial 2020 - Beginner's Training Guide](https://www.youtube.com/watch?v=iv8rSLsi1xo)
-    * [GitHub Markdown](https://guides.github.com/features/mastering-markdown/)
+- **Git**
 
-* **HTML/CSS**
-    * [freeCodeCamp - Get the 300 h "Responsive Web Design Certification"](https://www.freecodecamp.org/learn/)
-    * [Full Stack Web Development Tutorial Course](https://www.youtube.com/playlist?list=PLwoh6bBAszPrES-EOajos_E9gvRbL27wz&fbclid=IwAR36b5agLn2QJ_JYiOs3fTm54cB2FPdrInhe4QvDoJCVRq6oCoDOFGYKpPA)
+  - [Git Official Basics](https://git-scm.com/book/en/v2)
+  - [Git Basis by Colt Steele](https://www.youtube.com/watch?v=USjZcfj8yxE&t=14s)
+  - [Git and GitHub for Beginners - Crash Course by freeCodeCAmp](https://www.youtube.com/watch?v=RGOj5yH7evk)
+  - [GitHub Tutorial 2020 - Beginner's Training Guide](https://www.youtube.com/watch?v=iv8rSLsi1xo)
+  - [GitHub Markdown](https://guides.github.com/features/mastering-markdown/)
 
 * **WordPress**
     * [How to Make a Custom Website from Scratch using WordPress (Theme Development) by freeCodeCamp ](https://youtu.be/KibbYf9avko)
@@ -45,29 +50,43 @@ This is a video that explains a little bit how to start collaborating with the p
 <br />
 <br />
 
-## Books ##
+- **PHP**
+
+  - [PHP Tutorial](https://www.w3schools.com/php/DEFAULT.asp)
+
+  <br />
+
+- **WordPress**
+  _ [How to Make a Custom Website from Scratch using WordPress (Theme Development) by freeCodeCamp ](https://youtu.be/KibbYf9avko)
+  _ [Professional WordPress Theme & Plugin Development](https://www.udemy.com/course/photoshop-psd-to-wordpress-theme-development-from-scratch/) \* [WordPress Plugin Development](https://youtu.be/mm9aQiLEa10)
+  <br />
+  <br />
 
-* **Command Line** 
-    * [Learn Enough Command Line to Be Dangerous - Michael Hartl](https://www.learnenough.com/command-line-tutorial/basics)
+## Books
 
-* **JavaScript (JS)**
-    * [JavaScript for Impatient Programmers - Dr. Axel Raushmayer](https://exploringjs.com/impatient-js/index.html)    
+- **Command Line**
 
-* **Programming**
-    * [How to Design a Program - Matthias Felleisen, Robert Bruce Findler, Matthew Flatt, Shriram Krishnamurthi](https://htdp.org/2020-5-6/Book/index.html) 
+  - [Learn Enough Command Line to Be Dangerous - Michael Hartl](https://www.learnenough.com/command-line-tutorial/basics)
+
+- **JavaScript (JS)**
+
+  - [JavaScript for Impatient Programmers - Dr. Axel Raushmayer](https://exploringjs.com/impatient-js/index.html)
+
+- **Programming**
+  - [How to Design a Program - Matthias Felleisen, Robert Bruce Findler, Matthew Flatt, Shriram Krishnamurthi](https://htdp.org/2020-5-6/Book/index.html)
 
 <br />
 <br />
 
-## Presentation ##
+## Presentation
+
+- **A Junior Web Developer Resume**
+  - [How to write an awesome junior developer résumé in a few simple steps, by freeCodeCamp](https://www.freecodecamp.org/news/how-to-write-an-awesome-junior-developer-resume-in-a-few-simple-steps-316010db80ec/)
 
-* **A Junior Web Developer Resume**
-    * [How to write an awesome junior developer résumé in a few simple steps, by freeCodeCamp](https://www.freecodecamp.org/news/how-to-write-an-awesome-junior-developer-resume-in-a-few-simple-steps-316010db80ec/)
-    
 <br />
 
-* **Your LinkedIn**
-    * [Tips to Optimize your LinkedIn Profile for Developers](https://www.samanthaming.com/blog/tips-to-optimize-your-linkedin-profile-for-developers/)
+- **Your LinkedIn**
+  - [Tips to Optimize your LinkedIn Profile for Developers](https://www.samanthaming.com/blog/tips-to-optimize-your-linkedin-profile-for-developers/)
 
 <br />
 <br />