Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/korndoerferpi67188/ChareSWE

# Conflicts:
#	.idea/misc.xml
#	.idea/modules.xml

.gitignore

@@ -61,6 +61,7 @@ fabric.properties
 
 # Package Files #
 *.jar
+!jar/*.jar
 *.war
 *.ear
 *.zip

.idea/ChareSWE.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="10" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="true" project-jdk-name="10" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/../gitchareswe" />
   </component>
 </project>

.idea/modules.xml

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

README.md

@@ -29,3 +29,4 @@ Pia Korndörfer, Danial Eshete, Jana Gumbert, Amadou-Bah Aarif
 * **Homer Simpson** - *Qualitätssicherung* - [Profil](https://de.wikipedia.org/wiki/Homer_Simpson) 
 * ...
 
+¥≤

src/TestEshete.java

@@ -0,0 +1,2 @@
+public class TestEshete {
+}