chaged different things
test
add exception
Merge branch 'master' of https://github.com/Isaisaisa/DB-Merlin

Conflicts:
	Aufgabe_3/src/merlin/gui/MerlinLogin.java