hoffentlich gehts
FileIn fertig
Merge branch 'model_1104' of ssh://git@github.com/Wick3r/WikiN-G-ER.git
into model_1104

Conflicts:
	Wikinger/src/test/InputOutputTest.java
Merge remote-tracking branch 'origin/model_1104'

Conflicts:
	Wikinger/src/test/InputOutputTest.java