more vomiting / finishing touches
derp
Merge branch 'master' of https://github.com/jdcook/Veishea

Conflicts:
	.gitignore

	Veishea/AnimatedModelProcessor/obj/x86/Debug/AnimatedModelProcessor.csprojResolveAssemblyReference.cache

	Veishea/SkinnedModelLib/obj/x86/Debug/SkinnedModelLib.csprojResolveAssemblyReference.cache
	Veishea/Veishea.suo
	Veishea/Veishea/Veishea/bin/x86/Debug/Content/Shaders/CellShader.xnb

	Veishea/Veishea/Veishea/bin/x86/Debug/Content/Shaders/ParticleEffect.xnb

	Veishea/Veishea/Veishea/bin/x86/Debug/Content/Shaders/ToonSkinnedEffect.xnb
	Veishea/Veishea/Veishea/bin/x86/Debug/Content/derpsong.wma
	Veishea/Veishea/Veishea/bin/x86/Debug/Veishea.application
	Veishea/Veishea/Veishea/bin/x86/Debug/Veishea.exe
	Veishea/Veishea/Veishea/bin/x86/Debug/Veishea.exe.manifest
	Veishea/Veishea/Veishea/bin/x86/Debug/Veishea.pdb

	Veishea/Veishea/Veishea/obj/x86/Debug/VEISHEATHEGAME.csprojResolveAssemblyReference.cache
	Veishea/Veishea/Veishea/obj/x86/Debug/Veishea.application
	Veishea/Veishea/Veishea/obj/x86/Debug/Veishea.exe
	Veishea/Veishea/Veishea/obj/x86/Debug/Veishea.exe.manifest
	Veishea/Veishea/Veishea/obj/x86/Debug/Veishea.pdb
	Veishea/Veishea/VeisheaContent/obj/x86/Debug/ContentPipeline.xml

	Veishea/Veishea/VeisheaContent/obj/x86/Debug/VeisheaContent.contentprojResolveAssemblyReference.cache