Conflicts:
	.nuget/NuGet.exe
	Nancy.Bootstrappers.Mef.Tests/Composition/Hosting/NancyCatalogTests.cs
	Nancy.Bootstrappers.Mef.Tests/Composition/Registration/NancyRegistrationBuilderTests.cs
	Nancy.Bootstrappers.Mef.Tests/Nancy.Bootstrappers.Mef.Tests.csproj
	Nancy.Bootstrappers.Mef.Tests/TypeHelperTests.cs
	Nancy.Bootstrappers.Mef.Tests/packages.config
	Nancy.Bootstrappers.Mef.sln
	Nancy.Bootstrappers.Mef/Composition/Hosting/ExportProviderCollection.cs
	Nancy.Bootstrappers.Mef/Composition/Hosting/NancyExportProvider.cs
	Nancy.Bootstrappers.Mef/Composition/Registration/NancyRegistrationBuilder.cs
	Nancy.Bootstrappers.Mef/Extensions/ExportProviderExtensions.cs
	Nancy.Bootstrappers.Mef/Nancy.Bootstrappers.Mef.csproj
	Nancy.Bootstrappers.Mef/NancyBootstrapper.cs
	Nancy.Bootstrappers.Mef/TypeHelper.cs
	Nancy.Bootstrappers.Mef/packages.config
	README.md
	packages/repositories.config
Removed for a second.
Added back.