m
Merge branch 'master' of https://github.com/MMateusz/PSZT_czworki

Conflicts:
	PSZT_czworki1.0/src/controller/Controller.java