Created basic projectile object, beginning work on WeaponController
Fix merge conflict in Scene1.unity