fixed missing colliders and stuff
Merge branch 'master' of https://github.com/cloutier116/Dog-Game

Conflicts:
	doggame/Assets/Models/Materials/bonetex.mat
	doggame/Assets/Models/Materials/bonetex.mat.meta
	doggame/Assets/Models/bonefbx.fbm.meta
	doggame/Assets/Models/bonefbx.fbm/bonetex.tif.meta
	doggame/Assets/Models/bonefbx.fbx.meta
	doggame/Assets/Models/crate.mb.meta
	doggame/Assets/Models/cratefbx.fbx.meta
	doggame/Assets/UV Maps/bonetex.tif.meta
	doggame/Assets/UV Maps/crate coloredUV.png.meta
	doggame/Assets/UV Maps/crate desaturatedUV.png.meta