Merge branch 'master' of https://github.com/rzhukovskiy/break
fix battle model