pierwsze zadanie - git
Merge branch 'master' of https://github.com/abenedykt/IO2014-a

Conflicts:
	zadanie 1.txt