no message
Merge branch 'master' of https://github.com/cloutier116/Dog-Game

Conflicts:
	doggame/Assets/Models/dogbed.mb.meta
	doggame/Assets/Models/dogbedfbx.fbx.meta
	doggame/Assets/UV Maps/dogbed coloredUV.png.meta
	doggame/Assets/UV Maps/dogbed desaturatedUV.png.meta
	doggame/Assets/UV Maps/dogbedUV.png.meta
no message
Merge branch 'master' of https://github.com/cloutier116/Dog-Game

Conflicts:
	doggame/Assets/Models/Materials/desktex.mat
	doggame/Assets/Models/Materials/desktex.mat.meta
	doggame/Assets/Models/Materials/filingtex.mat
	doggame/Assets/Models/Materials/filingtex.mat.meta
	doggame/Assets/Models/deskfbx.fbm.meta
	doggame/Assets/Models/deskfbx.fbm/desktex.tif.meta
	doggame/Assets/Models/deskfbx.fbx.meta
	doggame/Assets/Models/filing_cabfbx.fbm.meta
	doggame/Assets/Models/filing_cabfbx.fbm/filingtex.tif.meta
	doggame/Assets/Models/filing_cabfbx.fbx.meta
	doggame/Assets/Models/trashcan.mb.meta
	doggame/Assets/Models/trashcanfbx.fbx.meta
	doggame/Assets/UV Maps/desktex.tif.meta
	doggame/Assets/UV Maps/filingtex.tif.meta
	doggame/Assets/UV Maps/trashcan coloredUV.png.meta
	doggame/Assets/UV Maps/trashcan desaturatedUV.png.meta
	doggame/Assets/UV Maps/trashcanUV.png.meta
	doggame/Assets/willsMainLevel.unity
Merge branch 'master' of https://github.com/cloutier116/Dog-Game

Conflicts:
	doggame/Assets/Models/bookshelf.mb.meta
	doggame/Assets/Models/bookshelffbx.fbx.meta
	doggame/Assets/UV Maps/bookshelf coloredUV.png.meta
	doggame/Assets/UV Maps/bookshelf desaturatedUV.png.meta
	doggame/Assets/UV Maps/bookshelfUV.png.meta