Combat Update

Added enemy movement, fixed combat bugs, added reloading to guns