added projectile assets. projectiles angle toward their targets
fixed merge conflicts