dao combat
Merge pull request #20 from melnkonga/daocombat

dao combat