fixed attack merge
Merge pull request #19 from ayaigame/test

fixed attack merge