pep8
Полное имя дракона с эпитетом
Merge remote-tracking branch 'OldHuntsman/master'
Генерация дракона
Сжатие изображений
Merge remote-tracking branch 'origin/treasury' into treasury

Conflicts:
	game/img/bg/special/dwarfcity.png
	game/pythoncode/core.py
Merge remote-tracking branch 'origin/treasury' into treasury

Conflicts:
	game/img/bg/special/dwarfcity.png
	game/pythoncode/core.py
Merge branch 'master' into treasury

Conflicts:
	game/labels/lb_special_places.rpy
Merge branch 'treasury'