again some differences in unimportant files
again some differences in unimportant files

Conflicts:
	MemoryCards/MemoryCards.v12.suo

	MemoryCards/MemoryCards/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	MemoryCards/MemoryCards/obj/Debug/MemoryCards.csproj.FileListAbsolute.txt

	MemoryCards/MemoryCards/obj/Debug/MemoryCards.csprojResolveAssemblyReference.cache