changed names and import style
Merge branch 'master' of https://github.com/mathijs750/monster-walk

Conflicts:
	combat.py
	render.py