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

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