work
Changing to another branch to work
YEAH YEAH
HAHA
Commitintg
Merge remote-tracking branch 'origin/DONT_Touch_ME-JACOB' into WillBranch

Conflicts:
	Assets/MYFG-Weapon Pack/Materials/Weapon.mat
	Assets/Main_Game/Scenes/Main_Scene.unity
	Assets/Main_Game/Scenes/adamScene.unity
	Assets/Main_Game/Scenes/adamScene.unity.meta
	Assets/Spawns/HealthSpawn/HealthSpawn.prefab
	Assets/Spawns/JetSpawn/JetSpawnScript.cs
	Assets/Spawns/Materials/Gas Bottle/Gas Bottle.prefab
	Assets/Spawns/SpeedSpawn/SpeedSpawn.prefab
	Assets/Spawns/SpeedSpawn/SpeedSpawnScript.cs
	ProjectSettings/TagManager.asset