Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/HelloWorld.java

scr/assets/Helpers.java

@@ -0,0 +1,55 @@
+import java.io.*;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+
+public class Helpers {
+
+    // Lesen einer Textdatei in ein Stringarray
+    public static String[] readTextdatei(String name) {
+        String line;
+        ArrayList<String> result = new ArrayList<String>();
+        try {
+            FileReader fr = new FileReader(name);
+            BufferedReader br = new BufferedReader(fr);
+            while ((line = br.readLine()) != null)
+                result.add(line);
+            br.close();
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+        return result.toArray(new String[]{});
+    }
+
+    // Schreiben eines Stringarray in eine Textdatei
+    public static void writeTextdatei(String name, String[] lines) {
+        try {
+            FileWriter fw = new FileWriter(name);
+            BufferedWriter bw = new BufferedWriter(fw);
+            PrintWriter pw = new PrintWriter(bw);
+            for (int i = 0; i < lines.length; i++)
+                pw.println(lines[i]);
+            pw.close();
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    // Berechnen des Hashwerts zu einem String und
+    // Rückgabe als Hex-Zeichenkette
+    public static String getHash(String w) {
+        try {
+            byte[] bytesOfMessage = w.getBytes("UTF-8");
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            byte[] thedigest = md.digest(bytesOfMessage);
+            return String.format("%032x", new BigInteger(1, thedigest));
+        } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+}

scr/assets/passwd

@@ -0,0 +1,4 @@
+hofmannol
+2df372ddeafdf65908ddda48799d6f21
+wimmerma
+eb9b41a390c3a252aff0454e8df16f75

src/HelloWorld.java

@@ -1,5 +1,4 @@
 public class HelloWorld {
-
     public static void main(String[] args) {
 
         System.out.println("Hallo Welt");

src/TestGumbert.java

@@ -0,0 +1,4 @@
+package PACKAGE_NAME;
+
+public class TestGumbert {
+}

src/TestKorndoerfer.java

@@ -0,0 +1,15 @@
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+
+public class TestKorndoerfer {
+    @Test
+    public void testMulitply(){
+        int i =2;
+        int result =i*2;
+        assertEquals(4, result);
+
+
+    }
+
+}

src/TestKorndoerferPi.java

@@ -0,0 +1,4 @@
+package PACKAGE_NAME;
+
+public class TestKorndoerferPi {
+}