Nearly complete
Merge branch 'master' of https://github.com/AnthonyNeace/xna-final-project

Conflicts:
	solution_hippoDemo/AnimatingThings/AnimatingThings/AnimatingThings.csproj.Debug.cachefile
	solution_hippoDemo/AnimatingThings/AnimatingThings/Game1.cs
	solution_hippoDemo/AnimatingThings/AnimatingThings/bin/x86/Debug/AnimatingThings.exe
	solution_hippoDemo/AnimatingThings/AnimatingThings/bin/x86/Debug/AnimatingThings.pdb
	solution_hippoDemo/AnimatingThings/AnimatingThings/bin/x86/Debug/gameInfo.txt
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/AnimatingThings.csproj.FileListAbsolute.txt
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/AnimatingThings.exe
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/AnimatingThings.pdb
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/ContentPipeline-{35DBF4FC-5CB1-41E9-89E6-F7218E2D7EE8}.xml
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/cachefile-{35DBF4FC-5CB1-41E9-89E6-F7218E2D7EE8}-targetpath.txt
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/grass_low_poly_0.xml
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/hippo/hippo_final_0.xml
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/hippoXNAattempt7_0.xml
	solution_hippoDemo/AnimatingThings/AnimatingThings/obj/x86/Debug/tree4-fbx_0.xml
	solution_hippoDemo/AnimatingThings/AnimatingThingsContent/AnimatingThingsContent.contentproj
	solution_hippoDemo/AnimatingThings/AnimatingThingsContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Fixing Merge issues