save current changes
save current changes
save current changes
save current changes
Merge commit '9c2f89a563fd2fed774b1f9777b1be326ad7f23e' into engine_test

Conflicts:
	__pycache__/parse_nature.cpython-34.pyc
	lib/__pycache__/TwitterEngine.cpython-34.pyc
	lib/__pycache__/characters.cpython-34.pyc
	lib/__pycache__/dice.cpython-34.pyc
	lib/__pycache__/echo.cpython-34.pyc
	lib/__pycache__/items.cpython-34.pyc
	lib/__pycache__/librarys.cpython-34.pyc
	lib/__pycache__/mapinfo.cpython-34.pyc
	lib/__pycache__/maps.cpython-34.pyc
	lib/__pycache__/monster.cpython-34.pyc
	lib/__pycache__/roominfo.cpython-34.pyc
	lib/__pycache__/skill.cpython-34.pyc
	lib/__pycache__/texts.cpython-34.pyc
	lib/dice.py
	lib/librarys.py
	newEngine3.py
	parse_nature.py
	scripts/__pycache__/battle.cpython-34.pyc
	scripts/__pycache__/main.cpython-34.pyc
	scripts/battle.py
	settings/map-D0.json
	settings/map-D1.json