Dotaz
Merge branch 'master' of https://github.com/serycjon/cjf_ds

Conflicts:
	Zavody_kone_db/src/DB/Maina.java