added attack and defense for attack class
Merge branch 'master' of https://github.com/iamhj/HEROES