?
.
.
Merge branch 'master' of https://github.com/louisMyu/GameName1

Conflicts:
	FarSeerTest/obj/ARM/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	GameName1.v11.suo
	GameName1/AnimationManager.cs
	GameName1/GameName1.csproj
	GameName1/Rifle.cs
	GameName1/Shotgun.cs
	GameName1/bin/WindowsPhone/ARM/Debug/GameName1.dll
	GameName1/bin/WindowsPhone/ARM/Debug/GameName1.pdb
	GameName1/bin/WindowsPhone/ARM/Debug/GameName1_Debug_ARM.xap
	GameName1/obj/ARM/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	GameName1/obj/ARM/Debug/GameName1.csprojResolveAssemblyReference.cache
	GameName1/obj/ARM/Debug/GameName1.dll
	GameName1/obj/ARM/Debug/GameName1.pdb
	GameName1/obj/ARM/Debug/XapCacheFile.xml
.