Changed rules of fight
Merge branch 'master' of https://github.com/newohybat/civ