added type and base attack
Merge branch 'master' of https://github.com/mindpin/js-warrior