added death conditions
Merge remote-tracking branch 'origin/master'

Conflicts:
	character.py
	test/test_world.py
fixed out of bounds error