refactoring
Merge branch 'master' of github.com:mokevnin/battle_asserts