Merge pull request #1 from eastfire/master

pull
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
add attack effect of slime and skeleton
Merge branch 'gh-pages'