Merge pull request #46 from malmuki/devMeleeAttacks

Dev melee attacks
Merge pull request #47 from malmuki/dev

Merge pull request #46 from malmuki/devMeleeAttacks