SZESZLYLI
CZapaine
Merge branch 'master' of https://github.com/imralav/ztpmtm.git

Conflicts:
	core/src/pl/edu/pb/wi/ztpmtm/Core.java