test
next
comit
Merge remote-tracking branch 'origin/master'

Conflicts:
	lista.txt
next n
zmiana
change
next nn
next nnn
test
test

l
zmiana
Merge branch 'master' of github.com:abenedykt/io2014-grupa1

Conflicts:
	lista.txt