duck character test
Merge branch 'master' of https://github.com/gaozihan3g/FatSuitGuy

Conflicts:
	FatSuitGuyUnity/Assets/Prefabs/Character.prefab
	FatSuitGuyUnity/FatSuitGuyUnity-csharp.sln
	FatSuitGuyUnity/FatSuitGuyUnity.sln
	FatSuitGuyUnity/FatSuitGuyUnity.userprefs