stash
Merge branch 'master' of https://github.com/dan335/dominus-battle
found a few bugs