From dcff3aeabd852e27bf0446d59fac96a2bde379b5 Mon Sep 17 00:00:00 2001
From: dxnso <david@emailarchiv.de>
Date: Tue, 23 Jul 2019 10:03:57 +0200
Subject: [PATCH 1/3] Merge branch 'master' of
 C:\Users\wurstda\PycharmProjects\Projekttage with conflicts.

---
 .idea/Projekttage.iml        | 11 +++++++++++
 .idea/modules.xml            |  2 +-
 Uebungen/Hallolo/__init__.py |  0
 Uebungen/test.txt            |  4 +++-
 Uebungen/test2.py            |  0
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .idea/Projekttage.iml
 create mode 100644 Uebungen/Hallolo/__init__.py
 create mode 100644 Uebungen/test2.py

diff --git a/.idea/Projekttage.iml b/.idea/Projekttage.iml
new file mode 100644
index 0000000..6711606
--- /dev/null
+++ b/.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>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3d624ce..9fb6e7a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Projekttage1.iml" filepath="$PROJECT_DIR$/.idea/Projekttage1.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/Projekttage.iml" filepath="$PROJECT_DIR$/.idea/Projekttage.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Uebungen/Hallolo/__init__.py b/Uebungen/Hallolo/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/Uebungen/test.txt b/Uebungen/test.txt
index 18c28f0..a131000 100644
--- a/Uebungen/test.txt
+++ b/Uebungen/test.txt
@@ -1 +1,3 @@
-Mir fällt nix ein
\ No newline at end of file
+name = "Huan"
+text = "Hier bitte Text einfügen"
+SDAfsv
\ No newline at end of file
diff --git a/Uebungen/test2.py b/Uebungen/test2.py
new file mode 100644
index 0000000..e69de29

From 314465d9315aa82469b059b6a07ae70c96921e44 Mon Sep 17 00:00:00 2001
From: dxnso <david@emailarchiv.de>
Date: Tue, 23 Jul 2019 10:22:12 +0200
Subject: [PATCH 2/3] Hallo

---
 Formeln.py        |  2 +-
 Uebungen/test2.py | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/Formeln.py b/Formeln.py
index 0be8810..9be212c 100644
--- a/Formeln.py
+++ b/Formeln.py
@@ -8,4 +8,4 @@ Formeln = [k.Formel('Kraftformel', i=k.Groesse('F', 'N', False), a=k.Groesse('m'
            k.Formel('Gleichm. beschl. Bew.', i=k.Groesse('s', 'm', False), a=k.Groesse(None, None, True, 0.5),
                     b=('a', 'm/s^2', False), c=k.Groesse('t', 's', False), z=konstante_eins, x=konstante_eins,
                     y=k.Groesse(None, None, True, 2)),
-           ]
+           k.formel('Gewichtskraft', i=k.Groesse('Fg', 'N',False), a=k.Groesse(None,None,True,9.81),b=('h','m',False),z=konstante_eins,y=konstante_eins,x=konstante_eins
\ No newline at end of file
diff --git a/Uebungen/test2.py b/Uebungen/test2.py
index e69de29..8161720 100644
--- a/Uebungen/test2.py
+++ b/Uebungen/test2.py
@@ -0,0 +1,36 @@
+import random
+
+guessesTaken = 0
+
+print ("Hello! What is your Name?")
+
+myName = input()
+
+niumber =random.randint(1, 20)
+
+print ("Well, ' + myName + ', I am thinking of a number between 1 and 20.")
+
+while guessesTaken < 6:
+    print ("Take a guess")
+    guess = input()
+    guess = int(guess)
+    guessesTaken = guessesTaken + 1
+
+    if guess < number:
+        print ("Your Number is too low")
+
+    if guess > number:
+        print ("Your Number is too high")
+
+    if guess == number:
+
+        break
+if guess == number:
+
+    guessesTaken = str(guessesTaken)
+
+    print("Good Job! You guessed my number in ' + guessesTaken + ' guesses!")
+
+if guess !=number:
+    number = str(number)
+    print ("Nope. The number I was tihinking of was " + number)
\ No newline at end of file

From 0246d05665e3a32cdf37a4187ad0b633b6bccd10 Mon Sep 17 00:00:00 2001
From: TimMcCool <timkrome2006@hotmail.com>
Date: Tue, 23 Jul 2019 11:06:42 +0200
Subject: [PATCH 3/3] Moin!

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 162a8f7..fad89ab 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1 @@
-# Projekttage
-
-Taschenrechner in den man gegeben und gesucht eingibt, und er er umformt und einsetzt sowie ausrechnet.
-
+# Projekttage
\ No newline at end of file