test
qdw:Merge branch 'master' of https://github.com/quickmailer/aufgabe3

Conflicts:
	.gitignore