uzupelnienie tresci zadania
Merge branch 'master' of github.com:agh-2lo/lab1

Conflicts:
	zadanie.txt