Merge pull request #37 from rhololkeolke/master

Bunch of improvements. Basic combat is working.