audio and ending
Merge remote-tracking branch 'origin/master'

Conflicts:
	doggame/Assets/Models/puppy texture.tif.meta
	doggame/doggame-csharp.sln
	doggame/doggame.sln
Merge branch 'master' of https://github.com/cloutier116/Dog-Game