ring
Merge branch 'master' of https://github.com/Robmaister/GameDev1Project3

Conflicts:
	Assets/Props/ring.fbx.meta
Merge branch 'master' of https://github.com/Robmaister/GameDev1Project3

Conflicts:
	Assets/Game3NewFighting.wav.meta
	Assets/HouseScene.unity
	Assets/Materials/Fridge.mat.meta
	Assets/Props/Glass 1.prefab.meta
	Assets/Props/Staircase.fbx.meta
	Assets/Props/coffeeTable.fbx.meta
	Assets/Props/fridge.fbm.meta
	Assets/Props/kitchenTable.fbm.meta