drugi...
Merge branch 'master' of github.com:michal-stankiewicz/bulbulator

Conflicts:
	test2.txt