added TV, put puppy texture back on
Merge branch 'master' of https://github.com/cloutier116/Dog-Game

Conflicts:
	doggame/Assets/Models/Materials/flttvtex.mat
	doggame/Assets/Models/Materials/flttvtex.mat.meta
	doggame/Assets/Models/Materials/tvtex.mat
	doggame/Assets/Models/Materials/tvtex.mat.meta
	doggame/Assets/Models/flattv.mb.meta
	doggame/Assets/Models/flattvfbx.fbm.meta
	doggame/Assets/Models/flattvfbx.fbm/flttvtex.tif.meta
	doggame/Assets/Models/flattvfbx.fbx.meta
	doggame/Assets/Models/tvfbx.fbm.meta
	doggame/Assets/Models/tvfbx.fbm/tvtex.tif.meta
	doggame/Assets/Models/tvfbx.fbx.meta
	doggame/Assets/UV Maps/door coloredUV.png.meta
	doggame/Assets/UV Maps/door desaturatedUV.png.meta
	doggame/Assets/UV Maps/flttvtex.tif.meta
	doggame/Assets/UV Maps/puppy texture.tif.meta
	doggame/Assets/UV Maps/tvtex.tif.meta
Merge branch 'master' of https://github.com/cloutier116/Dog-Game