clear comflict
Merge branch 'master' of github.com:dtak1114/rubycamp2013
vanished enemy and damege HitPoint.