test.py
Merge remote-tracking branch 'origin/engine_test' into engine_test

Conflicts:
	lib/characters.py
	settings/characters.json
	settings/monsters.json