setter and events
Merge branch 'engine_test' of https://github.com/Ariyn/DND into engine_test

Conflicts:
	lib/__pycache__/items.cpython-34.pyc