usuniecie
Merge branch 'master' of github.com:Tomito/Tomitoland

Conflicts:
	do zmiany