Merge branch '2-episode-8-use-two-separate-commit' into 'master'

Resolve "Episode 8: Use two separate commits for the changes on the branch (new info + improve line 1)."

Closes #2

See merge request hifis/hifis-workshops/introduction-to-git-and-gitlab/workshop-material!3

episodes/08-conflicts.md

@@ -59,8 +59,9 @@ o - o <- HEAD, master, mummy-info
   - Verify with `git branch`
 - Edit the file `mars.txt` and commit the changes
   - Add a new sentence at the end of the file: `Mummy will appreciate sand storms on Mars`
-  - Adapt the first line and attach at its end: ` (for Dracula)`
   - Add & commit it: `git add mars.txt`, `git commit -m "Add advantages for the Mummy"`
+  - Adapt the first line and attach at its end: ` (for Dracula)`
+  - Add & commit it: `git add mars.txt`, `git commit -m "Concretise dracula fact"`
   - Verify with `git graph`
 
 ```