CB modidify
Merge branch 'master' of git@github.com:Berken/Spiegel.git

Conflicts:
	test.txt