zadanie 1, zaj3
Merge branch 'master' of https://github.com/ambiguus/pwzn

Conflicts:
	tasks/zaj3/zadanie1.py