no message
no message
Merge branch 'engine_test' of https://github.com/Ariyn/DND into engine_test

Conflicts:
	lib/__pycache__/characters.cpython-34.pyc
	lib/__pycache__/echo.cpython-34.pyc
	lib/__pycache__/items.cpython-34.pyc
	lib/__pycache__/maps.cpython-34.pyc
	lib/characters.py
	scripts/__pycache__/main.cpython-34.pyc
	settings/characters.json
	settings/items.json
	settings/map-D0.json
	settings/map-D1.json