asd

Commit ? WTF!
Merge remote-tracking branch 'origin/Baza-danych' into Baza-danych

Conflicts:
	src/PanelFactory.java