kolejna zmiana
Merge branch 'pink-team'

Conflicts:
	cupcake.txt