промежуточный коммит
Merge branch 'master' of https://github.com/OldHuntsman/DefilerWings

Conflicts:
	game/pythoncode/core.py