Initial commit
Merge branch 'combat-rules'