meh
why

Conflicts:

	TowerDefence/TowerDefence/obj/x86/Debug/ContentPipeline-{C4C061A2-2598-4EB5-BDB0-1FEB5EF1FB39}.xml

	TowerDefence/TowerDefence/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	TowerDefence/TowerDefenceContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache