Textured bed
Merge branch 'master' of https://github.com/porglezomp/UnityHotel
Textured bed
New feature: Git conflicts

Conflicts:
	Assets/Blender Files/Assets/Bed.blend
	Assets/Blender Files/Assets/Materials/Bed.mat
	Assets/Blender Files/Assets/Materials/Bed.mat.meta
	Assets/Hotel.unity
	Assets/Prefabs/Static/Bed.prefab
	Assets/Textures/Props/Bed.psd
	Assets/Textures/Props/Bed.psd.meta