changed name of Merlin to MerlinLogic
Merge branch 'master' of https://github.com/Isaisaisa/DB-Merlin
Merge branch 'master' of https://github.com/Isaisaisa/DB-Merlin
still working on birdwatcher login.
Merge branch 'master' of https://github.com/Isaisaisa/DB-Merlin

Conflicts:
	Aufgabe_3/src/merlin/gui/MerlinLogin.java
	scheme_setup.sql
added isRegistrate()