Merge branch 'master' into 'feature_x'

# Conflicts: # Template/Config.tex

Merge branch 'master' into 'feature_x'
# Conflicts: # Template/Config.tex
9b1cc494 · Phillip Schröder · 5997c8bf · 3ace032b · 9b1cc494
Commit 9b1cc494 authored Jan 31, 2019 by Phillip Schröder
--- a/Template/Config.tex
+++ b/Template/Config.tex
@@ -2,4 +2,4 @@
 %--Masterdatei: Template
 \input{Config/usepackages.tex}
 \input{Config/newcommands.tex}
-%Schreibe etwas in Zeile 5 in einem neuen branch
\ No newline at end of file
+%schreibe etwas in Zeile 5 in Branch master
\ No newline at end of file