Placeholders for combat;
Merge branch 'master' of https://github.com/bjornswenson/mujujuju