Windows änderungen
Windows aenderung
Merge branch 'master' of https://github.com/Chrissi-P/LinuxTest

Conflicts:
	testfile.txt