Merge branch 'master' of H:\Java\IDEA\VM5000 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Login/Login.java
	src/gui/LoginFenster.java
	src/gui/MenuFenster.java
	src/gui/RegistrierungFenster.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
BildPanel neuer Konstruiktor mit alpha wert für das bild (trnasparenz)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/BilderPanel.java