find changes in login
edited Login and main
Merge remote-tracking branch 'origin/master'

Conflicts:
	della_FX/src/application/Main.java