NeueDatei
Merge branch 'develop' of https://github.com/FlarSGit/newGitTest into develop

Conflicts:
	NeueDatei.txt