Melee Updates

Put melee on a timer and fixed a few bugs