Merge branch 'Ahmad'

• Ahmad: Edited shooting feature Added gun feature to player Fixed Player scrpt bug Testing Sourcetree and pushing assets and scripts to branch Test Update .idea/.idea.cmpt-306.dir/.idea/.gitignore Added scripts to branch

Conflicts:

Cmpt-306/.gitignore

Cmpt-306/Assets/Prefabs.meta

Cmpt-306/Assets/Scripts.meta

Cmpt-306/Assets/Scripts/HealthBar.cs

Cmpt-306/Assets/Scripts/Player.cs

Cmpt-306/Packages/manifest.json

Cmpt-306/Packages/packages-lock.json

Cmpt-306/ProjectSettings/AudioManager.asset

Cmpt-306/ProjectSettings/DynamicsManager.asset

Cmpt-306/ProjectSettings/EditorSettings.asset

Cmpt-306/ProjectSettings/GraphicsSettings.asset

Cmpt-306/ProjectSettings/InputManager.asset

Cmpt-306/ProjectSettings/NavMeshAreas.asset

Cmpt-306/ProjectSettings/PackageManagerSettings.asset

Cmpt-306/ProjectSettings/Physics2DSettings.asset

Cmpt-306/ProjectSettings/ProjectSettings.asset

Cmpt-306/ProjectSettings/QualitySettings.asset

Cmpt-306/ProjectSettings/VFXManager.asset