noqaw
Merge branch 'master' of https://github.com/plolo/rabbit

Conflicts:
	nowy.TXT
naprawiony konflikt