Changed attack methods again
Merge branch 'master' of https://github.com/daltonwu/project-group7