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

Conflicts:
	doggame/Assets/UV Maps/counter desaturatedUV.png.meta
	doggame/Assets/UV Maps/menubg.tif.meta
no message
Merge branch 'master' of https://github.com/cloutier116/Dog-Game