fixed conflicts with elin's changes

Merge https://github.com/Elin-G/MB12 into Elin-G-master

# Conflicts:
#	README.md
#	poll.md

Author: 16EAGLE

README.md

@@ -33,6 +33,10 @@ Who reads this is a developer
 
 There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don’t look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn’t anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.
 
+<<<<<<< HEAD
 *Last changed on October 24th 2023
 
 ## Leonie tries out
+=======
+*Last changed on 24.10.2023*
+>>>>>>> f9053fee7d4b89ece82d149877eb87a34b7e393f

poll.md

@@ -62,3 +62,8 @@
 *1
 *python, R, GEE (Java)
 *windows
+
+# Elin Gerdes
+* 1
+* Python
+* Windows 10