a
Merge branch 'master' of https://github.com/mtadmk/fancy-name

k
Conflicts:
	dajkamienia.txt