z
Merge branch 'master' of https://github.com/aswarcewicz/noweRepo.git

Conflicts:
	nowypro/src/pliczek