merge error behoben

Merge branch 'developer'

# Conflicts:
#	Datei1.txt

Datei1.txt

@@ -4,3 +4,14 @@ Lorem Ipsum
 
 def neue_funktion():
 	print("funk")
+
+def schleife():
+	for i in range(10):
+		print(i)
+
+aki <- func(x) { 
+  print(x)
+}
+
+plot(1:10, rep(1,10))
+lines(1:10, 1:10)