Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/modules.xml

.idea/Projekttage1.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>

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Projekttage.iml" filepath="$PROJECT_DIR$/.idea/Projekttage.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/Projekttage1.iml" filepath="$PROJECT_DIR$/.idea/Projekttage1.iml" />
     </modules>
   </component>
 </project>

Uebungen/TimMcCool

@@ -0,0 +1,11 @@
+print ("STECKBRIEEF")
+print (" ")
+print ("Fragen:")
+name = input (str("1.Was ist dein Name?"))
+alter = input (str("2.Was ist dein Alter?"))
+ort = input (str("3.Wo wohnst du?"))
+print (" ")
+print ("Antworten:")
+print ("Name: " + name)
+print ("Alter: " + alter)
+print ("Wohnort: " + ort)