modified:   All/Ultimate2D.v11.suo
	modified:   All/UltimateAnimate/UltimateAnimate.csproj
	modified:   All/UltimateAnimate/bin/Debug/UltimateAnimate.exe
	modified:   All/UltimateAnimate/bin/Debug/UltimateAnimate.pdb
	modified:   All/UltimateAnimate/obj/Debug/UltimateAnimate.exe
	modified:   All/UltimateAnimate/obj/Debug/UltimateAnimate.pdb
Merge branch 'master' of https://github.com/LPPOINT/ultiani

Conflicts:
	All/Ultimate2D.v11.suo
	All/UltimateAnimate/bin/Debug/UltimateAnimate.exe
	All/UltimateAnimate/bin/Debug/UltimateAnimate.pdb
	All/UltimateAnimate/obj/Debug/UltimateAnimate.exe
	All/UltimateAnimate/obj/Debug/UltimateAnimate.pdb

	modified:   All/Ultimate2D/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	modified:   All/Ultimate2D/obj/Debug/Ultimate2D.csproj.FileListAbsolute.txt
	modified:   All/UltimateAnimate/AnimationModel/AnimationKeys.cs
	modified:   All/UltimateAnimate/AnimationModel/AnimationManager.cs
	modified:   All/UltimateAnimate/AnimationModel/EntityHandler.cs
	modified:   All/UltimateAnimate/AnimationModel/TimeSpanComparer.cs
	modified:   All/UltimateAnimate/EntityModel/BaseEntity.cs
	modified:   All/UltimateAnimate/EntityModel/TexturableEntity.cs
	new file:   All/UltimateAnimate/Readme.txt
	modified:   All/UltimateAnimate/State2.cs
	modified:   All/UltimateAnimate/UltimateAnimate.csproj
	modified:   All/UltimateAnimate/obj/Debug/UltimateAnimate.csproj.GenerateResource.Cache
	modified:   All/UltimateAnimate/obj/Debug/UltimateAnimate.csprojResolveAssemblyReference.cache