check in
	deleted:    ProgrammerPigLibrary/whUmbracoBase/bin/Debug/System.Net.Http.Formatting.dll
	deleted:    ProgrammerPigLibrary/whUmbracoBase/bin/Debug/System.Net.Http.Formatting.xml
	deleted:    ProgrammerPigLibrary/whUmbracoBase/bin/Debug/System.Web.Http.WebHost.dll
	deleted:    ProgrammerPigLibrary/whUmbracoBase/bin/Debug/System.Web.Http.WebHost.xml
	deleted:    ProgrammerPigLibrary/whUmbracoBase/bin/Debug/System.Web.Http.dll
	deleted:    ProgrammerPigLibrary/whUmbracoBase/bin/Debug/System.Web.Http.xml
	modified:   ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.dll
	modified:   ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.pdb
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csproj.FileListAbsolute.txt
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csprojResolveAssemblyReference.cache
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.dll
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.pdb
	modified:   midana/midana/bin/midana.dll
	modified:   midana/midana/bin/midana.pdb
	modified:   midana/midana/bin/whUmbracoBase.dll
	modified:   midana/midana/bin/whUmbracoBase.pdb
	modified:   midana/midana/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	modified:   midana/midana/obj/Debug/midana.csprojResolveAssemblyReference.cache
	modified:   midana/midana/obj/Debug/midana.dll
	modified:   midana/midana/obj/Debug/midana.pdb
Merge branch 'master' of https://github.com/ProgrammerPig/tfs

Conflicts:
	ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.dll
	ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.pdb
	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csproj.FileListAbsolute.txt
	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csprojResolveAssemblyReference.cache
	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.dll
	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.pdb
	midana/midana.v11.suo
	midana/midana/bin/midana.dll
	midana/midana/bin/midana.pdb
	midana/midana/bin/whUmbracoBase.dll
	midana/midana/bin/whUmbracoBase.pdb
	midana/midana/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	midana/midana/obj/Debug/midana.csprojResolveAssemblyReference.cache
	midana/midana/obj/Debug/midana.dll
	midana/midana/obj/Debug/midana.pdb

	modified:   .gitignore
	new file:   .gitignore_global
	modified:   MsBuild/MsBuildConfig/bin/Debug/MsBuildConfig.dll
	modified:   MsBuild/MsBuildConfig/bin/Debug/MsBuildConfig.pdb
	modified:   MsBuild/MsBuildConfig/obj/Debug/MsBuildConfig.dll
	modified:   MsBuild/MsBuildConfig/obj/Debug/MsBuildConfig.pdb
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csproj.FileListAbsolute.txt
	modified:   midana/Midana2Helpers/bin/Debug/Midana2Helpers.dll
	modified:   midana/Midana2Helpers/bin/Debug/Midana2Helpers.pdb
	modified:   midana/Midana2Helpers/obj/Debug/Midana2Helpers.dll
	modified:   midana/Midana2Helpers/obj/Debug/Midana2Helpers.pdb
	deleted:    midana/midana/Umbraco/sublayouts/test.cs
	modified:   midana/midana/Web.config
	deleted:    midana/midana/bin/AutoMapper.dll
	deleted:    midana/midana/bin/AutoMapper.xml
	deleted:    midana/midana/bin/ClientDependency.Core.dll
	deleted:    midana/midana/bin/CookComputing.XmlRpcV2.dll
	deleted:    midana/midana/bin/Examine.dll
	deleted:    midana/midana/bin/HtmlAgilityPack.dll
	deleted:    midana/midana/bin/HtmlAgilityPack.xml
	deleted:    midana/midana/bin/ICSharpCode.SharpZipLib.dll
	deleted:    midana/midana/bin/Lucene.Net.dll
	deleted:    midana/midana/bin/Lucene.Net.xml
	deleted:    midana/midana/bin/Microsoft.ApplicationBlocks.Data.dll
	deleted:    midana/midana/bin/Microsoft.Web.Mvc.FixedDisplayModes.dll
	deleted:    midana/midana/bin/Midana2Helpers.dll
	deleted:    midana/midana/bin/Midana2Helpers.pdb
	deleted:    midana/midana/bin/MiniProfiler.dll
	deleted:    midana/midana/bin/MiniProfiler.xml
	deleted:    midana/midana/bin/MySql.Data.dll
	deleted:    midana/midana/bin/Newtonsoft.Json.dll
	deleted:    midana/midana/bin/Newtonsoft.Json.xml
	deleted:    midana/midana/bin/System.Net.Http.Formatting.dll
	deleted:    midana/midana/bin/System.Web.Http.WebHost.dll
	deleted:    midana/midana/bin/System.Web.Http.dll
	deleted:    midana/midana/bin/System.Web.Mvc.dll
	deleted:    midana/midana/bin/System.Web.Mvc.xml
	deleted:    midana/midana/bin/TidyNet.dll
	deleted:    midana/midana/bin/Umbraco.Core.dll
	deleted:    midana/midana/bin/Umbraco.Core.xml
	deleted:    midana/midana/bin/Umbraco.Web.UI.dll
	deleted:    midana/midana/bin/UmbracoExamine.dll
	deleted:    midana/midana/bin/UmbracoExamine.xml
	deleted:    midana/midana/bin/UrlRewritingNet.UrlRewriter.dll
	deleted:    midana/midana/bin/businesslogic.dll
	deleted:    midana/midana/bin/businesslogic.xml
	deleted:    midana/midana/bin/cms.dll
	deleted:    midana/midana/bin/cms.xml
	deleted:    midana/midana/bin/controls.dll
	deleted:    midana/midana/bin/controls.xml
	deleted:    midana/midana/bin/epengine.dll
	deleted:    midana/midana/bin/ephtmltopdf.dll
	deleted:    midana/midana/bin/interfaces.dll
	deleted:    midana/midana/bin/interfaces.xml
	deleted:    midana/midana/bin/itextsharp.dll
	deleted:    midana/midana/bin/itextsharp.xmlworker.dll
	deleted:    midana/midana/bin/log4net.dll
	deleted:    midana/midana/bin/umbraco.DataLayer.dll
	deleted:    midana/midana/bin/umbraco.DataLayer.xml
	deleted:    midana/midana/bin/umbraco.MacroEngines.dll
	deleted:    midana/midana/bin/umbraco.MacroEngines.xml
	deleted:    midana/midana/bin/umbraco.XmlSerializers.dll
	deleted:    midana/midana/bin/umbraco.dll
	deleted:    midana/midana/bin/umbraco.editorControls.dll
	deleted:    midana/midana/bin/umbraco.editorControls.xml
	deleted:    midana/midana/bin/umbraco.providers.dll
	deleted:    midana/midana/bin/umbraco.providers.xml
	deleted:    midana/midana/bin/umbraco.xml
	modified:   midana/midana/midana.csproj
	deleted:    midana/midana/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
	deleted:    midana/midana/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
	deleted:    midana/midana/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
	deleted:    midana/midana/obj/Debug/midana.csproj.FileListAbsolute.txt
Merge branch 'master' of https://github.com/ProgrammerPig/tfs

Conflicts:
	ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.dll
	ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.pdb

	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csproj.FileListAbsolute.txt

	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csprojResolveAssemblyReference.cache
	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.dll
	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.pdb
	midana/midana.v11.suo
	midana/midana/bin/midana.dll
	midana/midana/bin/midana.pdb
	midana/midana/bin/whUmbracoBase.dll
	midana/midana/bin/whUmbracoBase.pdb
	midana/midana/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	midana/midana/obj/Debug/midana.csprojResolveAssemblyReference.cache
	midana/midana/obj/Debug/midana.dll
	midana/midana/obj/Debug/midana.pdb