no nightstand
Collider on room, floor no longer has construction worker texture
Merge remote-tracking branch 'origin/master' into Finished_Jumping

Conflicts:
	doggame/Assets/Models/puppy.mb