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

Conflicts:
	QuickMailer/src/gui/QuickmailGui.java