Gate
TrapScripts
Merge branch 'Leon' into develop

Conflicts:
	Assets/Models/Tower&TrapsModels/Materials/Material_001__spearThingyUV_Texture_png.mat
	Assets/Models/Tower&TrapsModels/Materials/Material_002.mat
	Assets/Models/Tower&TrapsModels/Materials/Material_002.mat.meta
	Assets/Models/Tower&TrapsModels/Materials/Material_004__spearTrapSidesUV_Texture_psd.mat
	Assets/Models/Tower&TrapsModels/Materials/Material_004__spearTrapSidesUV_Texture_psd.mat.meta
	Assets/Models/Tower&TrapsModels/Materials/Material_005.mat
	Assets/Models/Tower&TrapsModels/Materials/Material_005.mat.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinal_3.blend.meta
	Assets/Scripts/bin.meta