powrót
Merge branch 'Mateusz_2006' of https://github.com/projektJavaPip/PIP_projekt into Mateusz_2006

Conflicts:
	PIP/build/classes/pl/pip/PIP.class
Merge remote-tracking branch 'origin/Mateusz_2006' into laczenie-23

Conflicts:
	PIP/build/classes/pl/pip/PIP.class