up to dAte 11/26
Merge branch 'masterJacob' of https://github.com/skyflyer55/327GroupProject into masterJacob

Conflicts:
	Assets/MYFG-Weapon Pack/Materials.meta
	Assets/Main_Game/Scenes/Main_Scene.unity

Ima tree lover