Changed projectile speed and set Projectile to be a bullet in physics engine.
Fixed merge conflicts?