Rewrote attack combat system and added lives to characters
Merge branch 'master' of https://github.com/eeckul/tojam2013