Merge pull request #53 from malmuki/devMeleeAttacks

Dev melee attacks
the alert part of the code seems to work but it creates huge performance
drops, don't merge this until binary heap is finished