move to folder
adsda
Merge branch 'master' of https://github.com/quickmailer/aufgabe3

Conflicts:
	QuickMailer/quickmailer-data.xml
	QuickMailer/src/storage/StorageService.java