Add comments to classes, remove old battle system
Merge remote-tracking branch 'origin/master'