Merge pull request #47 from malmuki/dev

Merge pull request #46 from malmuki/devMeleeAttacks
Merge pull request #49 from malmuki/devMeleeAttacks

Merge pull request #47 from malmuki/dev