LOOTL; GROUND; ENEMIES; SHRINE FIXES; I WANT A PEON;
Merge branch 'master' of https://github.com/bjornswenson/MujuJuju

Conflicts:
	app/ctx/game.lua
	app/enemies/enemy.lua