save current changes
save current changes
save current changes
Merge commit 'a180714cb2d7e9a9dadbeee72174622cff409763' into engine_test

Conflicts:
	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__/roominfo.cpython-34.pyc
	scripts/__pycache__/main.cpython-34.pyc
	settings/map-D0.json
	settings/map-D1.json
save current changes
save current changes
Merge commit 'c99c159697bda8e032be3cdf8e6e3d94a972fdc9' into engine_test

Conflicts:
	lib/__pycache__/d40lib.cpython-34.pyc
	lib/__pycache__/echo.cpython-34.pyc
	lib/__pycache__/librarys.cpython-34.pyc
	lib/characters.py
	lib/librarys.py
	settings/characters.json