Combat works; Enemies die;
Merge branch 'master' of https://github.com/bjornswenson/MujuJuju

Conflicts:
	app/enemies.lua