fixed small errors
Merge branch 'master' of https://github.com/vinglfm/Combat