Bed is a bed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/HouseScene.unity
Merge branch 'master' of https://github.com/Robmaister/GameDev1Project3

Conflicts:
	Assets/HouseScene.unity
Merge branch 'master' of https://github.com/Robmaister/GameDev1Project3

Conflicts:
	Assets/HouseScene.unity