Merge branch 'conflicts' into 'master'

Conflicts

See merge request reswp-2020/galaxytrucker!13

.gitignore

@@ -125,3 +125,34 @@ Thumbs.db
 !/ios-moe/xcode/*.xcodeproj/xcshareddata
 !/ios-moe/xcode/*.xcodeproj/project.pbxproj
 /ios-moe/xcode/native/
+
+#==========Gitignore for Documentation==========
+
+#===Ignore LaTeX outputs===
+*.aux
+*.lof
+*.lot
+*.fls
+*.out
+*.toc
+*.fmt
+*.fot
+*.cb
+*.cb2
+.*.lb
+
+# Versteckte Dateien (aber .gitignore behalten)
+.*
+!.gitignore
+
+#===Ignore PDF files===
+Architekturbeschreibung.pdf
+*.out.ps
+
+# Log file
+*.log
+
+# Package Files 
+*.tar.gz
+*.synctex.gz
+

Server/Server.iml

+<?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>
\ No newline at end of file

doc/.gitignore

-#==========Gitignore for Documentation==========
-
-#===Ignore LaTeX outputs===
-*.aux
-*.lof
-*.lot
-*.fls
-*.out
-*.toc
-*.fmt
-*.fot
-*.cb
-*.cb2
-.*.lb
-
-#===Ignore PDF files===
-Architekturbeschreibung.pdf
-*.out.ps
-
-# Log file
-*.log
-
-# Package Files 
-*.tar.gz
-*.synctex.gz
\ No newline at end of file