Merge branch 'master' of C:\Users\michelar\PycharmProjects\Projekttage with conflicts.

.idea/Projekttage.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>

Uebungen/test.txt

@@ -1 +0,0 @@
-Mir fällt nix ein

Uebungen/uff/__init__.py

@@ -0,0 +1,8 @@
+alter = int(input ("Wie alt bist du?"))
+
+print (alter)
+
+if alter <=18:
+    print ("Du junges Schwein")
+else:
+    print ("ehre")

Uebungen/uff/asdfgh.py

@@ -0,0 +1,8 @@
+alter = int(input ("Wie alt bist du?"))
+
+print (alter)
+
+if alter <=18:
+    print ("Du junges Schwein")
+else:
+    print ("ehre")