Minion work; Player work;
Merge branch 'master' of https://github.com/bjornswenson/MujuJuju
Merge branch 'master' of https://github.com/bjornswenson/MujuJuju

Conflicts:
	app/ctx/game.lua
Enemy improvements; lol.