Merge confilict D:
Merge remote-tracking branch 'origin/master'

Conflicts:
	Latex.ver.1/docs/dokumentation/cdrom/Readme.txt
Correct merge