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

Conflicts:
	doggame/Assets/testScene.unity
	doggame/doggame-csharp.sln
	doggame/doggame.sln
Merge branch 'master' of https://github.com/cloutier116/Dog-Game