no message
Merge branch 'master' of https://github.com/cloutier116/Dog-Game
Added objects for first room, messed with textures, fiddled with some boxes.
Merge branch 'master' of https://github.com/cloutier116/Dog-Game

Conflicts:
	doggame/Assets/Models/door.mb.meta
	doggame/Assets/Models/doorfbx.fbx.meta
	doggame/Assets/UV Maps/chair colored2UV.png.meta
	doggame/Assets/UV Maps/chair colored3UV.png.meta
	doggame/Assets/UV Maps/chair desaturated2UV.png.meta
	doggame/Assets/UV Maps/chair desaturated3UV.png.meta
	doggame/Assets/UV Maps/doorUV.png.meta
	doggame/Assets/UV Maps/dresser desaturatedUV.png.meta