f
d
Merge branch 'master' of github.com:warzyn/nowe

Conflicts:
	README.md