sdasd
Merge branch '1.0_release'

Conflicts:
	Plik.txt