Alors?
Merge remote-tracking branch 'origin/master'

Conflicts:
	Neuer Ordner/Neues Textdokument 2.txt