Noch mal changes
Merge branch 'master' of https://github.com/TS2000/newGitTest

Conflicts:
	index.html