From e3d185017b49bd12b02eee8939df483073400bcd Mon Sep 17 00:00:00 2001
From: 15128 <15128@A001-10.nordakademie.intern>
Date: Thu, 26 Oct 2017 09:41:24 +0200
Subject: [PATCH 1/4] Hallo Welt programmiert

---
 src/uebung_1_1/HalloWelt.java | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/uebung_1_1/HalloWelt.java

diff --git a/src/uebung_1_1/HalloWelt.java b/src/uebung_1_1/HalloWelt.java
new file mode 100644
index 0000000..9a60057
--- /dev/null
+++ b/src/uebung_1_1/HalloWelt.java
@@ -0,0 +1,10 @@
+package uebung_1_1;
+
+public class HalloWelt {
+
+	public static void main(String[] args) {
+		System.out.println("Hallo Welt!");
+
+	}
+
+}

From 8632a45c6b2b8a8333dbbfb44ef65b7b910bf473 Mon Sep 17 00:00:00 2001
From: 15128 <15128@A001-10.nordakademie.intern>
Date: Thu, 26 Oct 2017 11:16:45 +0200
Subject: [PATCH 2/4] Quadratwurzel berechnet

---
 src/uebung_1_1/{HalloWelt.java => Quadratwurzel.java} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/uebung_1_1/{HalloWelt.java => Quadratwurzel.java} (100%)

diff --git a/src/uebung_1_1/HalloWelt.java b/src/uebung_1_1/Quadratwurzel.java
similarity index 100%
rename from src/uebung_1_1/HalloWelt.java
rename to src/uebung_1_1/Quadratwurzel.java

From 041edcbdd771b413c7888ef4adb8f099628fdff0 Mon Sep 17 00:00:00 2001
From: 15128 <15128@A001-10.nordakademie.intern>
Date: Thu, 26 Oct 2017 11:17:07 +0200
Subject: [PATCH 3/4] Quadratwurzel berechnet

---
 src/uebung_1_1/Quadratwurzel.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/uebung_1_1/Quadratwurzel.java b/src/uebung_1_1/Quadratwurzel.java
index 9a60057..2fc2391 100644
--- a/src/uebung_1_1/Quadratwurzel.java
+++ b/src/uebung_1_1/Quadratwurzel.java
@@ -1,10 +1,17 @@
 package uebung_1_1;
 
-public class HalloWelt {
-
+public class Quadratwurzel{
 	public static void main(String[] args) {
-		System.out.println("Hallo Welt!");
+		double p = 8;
+		double q = 2;		
 
+		double unterderwurzel = (Math.sqrt((p/2)*(p/2)-q));
+		double vorderwurzel = (-p/2);
+		double x1 = (vorderwurzel - unterderwurzel);
+		double x2 = (vorderwurzel + unterderwurzel);
+		
+		System.out.println ("Die Ergebnisse:");
+		System.out.println(("x1=" + x1));
+		System.out.println(("x2=" +x2));
 	}
-
 }

From 964826993189b5f876335e4640dfd344e3e72adb Mon Sep 17 00:00:00 2001
From: 15128 <15128@A001-10.nordakademie.intern>
Date: Thu, 16 Nov 2017 10:41:20 +0100
Subject: [PATCH 4/4] Quadratwurzel berechnen

---
 src/uebung_1_1/Quadratwurzel.java | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 src/uebung_1_1/Quadratwurzel.java

diff --git a/src/uebung_1_1/Quadratwurzel.java b/src/uebung_1_1/Quadratwurzel.java
deleted file mode 100644
index 2fc2391..0000000
--- a/src/uebung_1_1/Quadratwurzel.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package uebung_1_1;
-
-public class Quadratwurzel{
-	public static void main(String[] args) {
-		double p = 8;
-		double q = 2;		
-
-		double unterderwurzel = (Math.sqrt((p/2)*(p/2)-q));
-		double vorderwurzel = (-p/2);
-		double x1 = (vorderwurzel - unterderwurzel);
-		double x2 = (vorderwurzel + unterderwurzel);
-		
-		System.out.println ("Die Ergebnisse:");
-		System.out.println(("x1=" + x1));
-		System.out.println(("x2=" +x2));
-	}
-}