gerkovink · MagicXIV · Nov 5, 2024 · Nov 5, 2024 · Nov 5, 2024 · Nov 5, 2024
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/OlderCourseRepository.iml b/.idea/OlderCourseRepository.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/New-Item b/New-Item
diff --git a/README.Rmd b/README.Rmd
@@ -14,16 +14,18 @@ knitr::opts_chunk$set(
 )
 options(width = 60, digits = 3)
 ```
-
 # markup 2020 <a href='https://github.com/gerkovink/markup2020'><img src='markup_sticker_SMALL.png' align="right" height="139" /></a>
 
+Wk3_jasmijnbazen
+Course collaboration for 202000010
 
 Course collaboration for 202000010. 
 
 You need to solve this conflict in a generic manner such that your classmates can also merge their forked branch into this master branch. So think about a solution on your end. 
 
 Gerko
 
+master
 
 ---
 
diff --git a/README.md b/README.md
@@ -2,12 +2,15 @@
 
 # markup 2020 <a href='https://github.com/gerkovink/markup2020'><img src='markup_sticker_SMALL.png' align="right" height="139" /></a>
 
-Course collaboration for 202000010.
+Wk3_jasmijnbazen
+Course collaboration for 202000010
 
-You need to solve this conflict in a generic manner such that your
-classmates can also merge their forked branch into this master branch.
-So think about a solution on your end.
+Course collaboration for 202000010. 
+
+You need to solve this conflict in a generic manner such that your classmates can also merge their forked branch into this master branch. So think about a solution on your end. 
 
 Gerko
 
------
+master
+
+---
diff --git a/add_another_text_file.txt b/add_another_text_file.txt
diff --git a/add_text_file.txt b/add_text_file.txt
diff --git a/jasmijnbazen.txt b/jasmijnbazen.txt