more battle crap
Merge branch 'master' of https://github.com/Epitaph64/LudumDare29