Sync master with latest from branching basics.

04-branching-basics/exercices.md

+# Git Branching Basics - Exercises
+
+## Using GitLab
+
+  1. Create a branch dedicated to a subgroup of your animal categories.
+  2. With the Web IDE add one or more entries to you animal description file.
+  3. Commit to your new branch.
+
+## Using the Command Line Interface
+
+  1. Synchronize your local copy of the repository.
+  2. Create another new branch for another subgroup of your animal categories.
+  3. Use an editor to add one or more entries to your animal description file.
+  4. Commit to your new branch.
+  5. Merge your new (local) branch into the main branch.
+  6. Merge the branch created in GitLab into the main branch, and solve conflicts if needed.
+
+
+