Fixed the mess I made....
Fixed?
Merge branch 'Testing-Goal-2' of https://github.com/gastew15/Evolo into Testing-Goal-2

Conflicts:
	Evolo/Evolo/obj/x86/Debug/ContentPipeline-{F291D55B-2072-440A-9DF0-8378AC35B6E3}.xml