w pizdu
go
Merge branch 'master' of https://github.com/MMateusz/PSZT_czworki.git

Conflicts:
	PSZT_czworki1.0/src/controller/Controller.java
cos2
Merge branch 'master' of https://github.com/MMateusz/PSZT_czworki.git

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