deleted:    Diagnostic Tools API Demo.sln
	deleted:    Diagnostic Tools API Demo.suo
	deleted:    Diagnostic Tools API Demo/API Classes/API_Settings.cs
	deleted:    Diagnostic Tools API Demo/API Classes/Crypt.cs
	deleted:    Diagnostic Tools API Demo/API Classes/Dig.cs
	deleted:    Diagnostic Tools API Demo/API Classes/Locations.cs
	deleted:    Diagnostic Tools API Demo/API Classes/Mtr.cs
	deleted:    Diagnostic Tools API Demo/API_Settings_Window.Designer.cs
	deleted:    Diagnostic Tools API Demo/API_Settings_Window.cs
	deleted:    Diagnostic Tools API Demo/API_Settings_Window.resx
	deleted:    Diagnostic Tools API Demo/Diagnostic Tools API Demo.csproj
	deleted:    Diagnostic Tools API Demo/Diagnostic Tools API Demo.csproj.user
	deleted:    Diagnostic Tools API Demo/DiagnosticToolsAPI.Designer.cs
	deleted:    Diagnostic Tools API Demo/DiagnosticToolsAPI.cs
	deleted:    Diagnostic Tools API Demo/DiagnosticToolsAPI.resx
	deleted:    Diagnostic Tools API Demo/Program.cs
	deleted:    Diagnostic Tools API Demo/Properties/AssemblyInfo.cs
	deleted:    Diagnostic Tools API Demo/Properties/Resources.Designer.cs
	deleted:    Diagnostic Tools API Demo/Properties/Resources.resx
	deleted:    Diagnostic Tools API Demo/Properties/Settings.Designer.cs
	deleted:    Diagnostic Tools API Demo/Properties/Settings.settings
	deleted:    Diagnostic Tools API Demo/Resources/AkamaiOPEN.ico
	deleted:    Diagnostic Tools API Demo/Resources/Akamai_Logo_BlueWhite.png
	deleted:    Diagnostic Tools API Demo/Resources/Akamai_OPEN_Logo.png
	deleted:    Diagnostic Tools API Demo/Resources/DragButton.gif
	deleted:    Diagnostic Tools API Demo/Resources/ExitButton.gif
	deleted:    Diagnostic Tools API Demo/Resources/LocationReloadButton.png
	deleted:    Diagnostic Tools API Demo/Resources/MinimizeButton.gif
	deleted:    Diagnostic Tools API Demo/Resources/SettingsButton.png
	deleted:    Diagnostic Tools API Demo/Settings.cs
	deleted:    Diagnostic Tools API Demo/StyleCop.Cache
	deleted:    Diagnostic Tools API Demo/app.config
	deleted:    Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.application
	deleted:    Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.exe
	deleted:    Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.exe.config
	deleted:    Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.exe.manifest
	deleted:    Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.pdb
	deleted:    Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.vshost.application
	deleted:    Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.vshost.exe
	deleted:    Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.vshost.exe.config
	deleted:    Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.vshost.exe.manifest
	deleted:    Diagnostic Tools API Demo/bin/Debug/RestSharp.dll
	deleted:    Diagnostic Tools API Demo/bin/Debug/RestSharp.xml
	deleted:    Diagnostic Tools API Demo/bin/Debug/WindowsFormsApplication1.vshost.exe
	deleted:    Diagnostic Tools API Demo/bin/Debug/WindowsFormsApplication1.vshost.exe.manifest
	deleted:    Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.application
	deleted:    Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.exe
	deleted:    Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.exe.config
	deleted:    Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.exe.manifest
	deleted:    Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.pdb
	deleted:    Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.vshost.application
	deleted:    Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.vshost.exe
	deleted:    Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.vshost.exe.config
	deleted:    Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.vshost.exe.manifest
	deleted:    Diagnostic Tools API Demo/bin/Release/RestSharp.dll
	deleted:    Diagnostic Tools API Demo/bin/Release/RestSharp.xml
	deleted:    Diagnostic Tools API Demo/bin/Release/app.publish/Application Files/Diagnostic Tools API Demo_1_0_0_0/Diagnostic Tools API Demo.exe.config.deploy
	deleted:    Diagnostic Tools API Demo/bin/Release/app.publish/Application Files/Diagnostic Tools API Demo_1_0_0_0/Diagnostic Tools API Demo.exe.deploy
	deleted:    Diagnostic Tools API Demo/bin/Release/app.publish/Application Files/Diagnostic Tools API Demo_1_0_0_0/Diagnostic Tools API Demo.exe.manifest
	deleted:    Diagnostic Tools API Demo/bin/Release/app.publish/Application Files/Diagnostic Tools API Demo_1_0_0_0/RestSharp.dll.deploy
	deleted:    Diagnostic Tools API Demo/bin/Release/app.publish/Diagnostic Tools API Demo.application
	deleted:    Diagnostic Tools API Demo/bin/Release/app.publish/setup.exe
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/AkamaiOPEN.APISettingsWindow.resources
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/AkamaiOPEN.DiagnosticToolsAPI.resources
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/AkamaiOPEN.Properties.Resources.resources
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.application
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.csproj.FileListAbsolute.txt
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.csproj.GenerateResource.Cache
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.csprojResolveAssemblyReference.cache
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.exe
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.exe.manifest
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.pdb
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/GenerateResource.read.1.tlog
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/GenerateResource.write.1.tlog
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/ResolveAssemblyReference.cache
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/WindowsFormsApplication1.DiagnosticToolsAPI.resources
	deleted:    Diagnostic Tools API Demo/obj/x86/Debug/WindowsFormsApplication1.Properties.Resources.resources
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/AkamaiOPEN.APISettingsWindow.resources
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/AkamaiOPEN.DiagnosticToolsAPI.resources
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/AkamaiOPEN.Properties.Resources.resources
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/Diagnostic Tools API Demo.application
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/Diagnostic Tools API Demo.csproj.FileListAbsolute.txt
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/Diagnostic Tools API Demo.exe
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/Diagnostic Tools API Demo.exe.manifest
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/Diagnostic Tools API Demo.pdb
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/GenerateResource.read.1.tlog
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/GenerateResource.write.1.tlog
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/ResolveAssemblyReference.cache
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/StyleCopViolations.xml
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll
	deleted:    Diagnostic Tools API Demo/obj/x86/Release/build.force
Merge branch 'master' of https://github.com/johicks/Akamai-OPEN-CSharp-Diag-Tools-API

Conflicts:
	Diagnostic Tools API Demo.suo
	Diagnostic Tools API Demo/API_Settings_Window.Designer.cs
	Diagnostic Tools API Demo/API_Settings_Window.cs
	Diagnostic Tools API Demo/DiagnosticToolsAPI.Designer.cs
	Diagnostic Tools API Demo/DiagnosticToolsAPI.cs
	Diagnostic Tools API Demo/Properties/Settings.Designer.cs
	Diagnostic Tools API Demo/Properties/Settings.settings
	Diagnostic Tools API Demo/app.config
	Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.application
	Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.exe
	Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.exe.config
	Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.exe.manifest
	Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.pdb
	Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.vshost.application
	Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.vshost.exe.config
	Diagnostic Tools API Demo/bin/Debug/Diagnostic Tools API Demo.vshost.exe.manifest
	Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.application
	Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.exe.config
	Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.exe.manifest
	Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.pdb
	Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.vshost.application
	Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.vshost.exe.config
	Diagnostic Tools API Demo/bin/Release/Diagnostic Tools API Demo.vshost.exe.manifest
	Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.application
	Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.exe
	Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.exe.manifest
	Diagnostic Tools API Demo/obj/x86/Debug/Diagnostic Tools API Demo.pdb
	Diagnostic Tools API Demo/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll
	Diagnostic Tools API Demo/obj/x86/Release/AkamaiOPEN.Properties.Resources.resources
	Diagnostic Tools API Demo/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
	Diagnostic Tools API Demo/obj/x86/Release/Diagnostic Tools API Demo.application
	Diagnostic Tools API Demo/obj/x86/Release/Diagnostic Tools API Demo.exe
	Diagnostic Tools API Demo/obj/x86/Release/Diagnostic Tools API Demo.exe.manifest
	Diagnostic Tools API Demo/obj/x86/Release/Diagnostic Tools API Demo.pdb
	Diagnostic Tools API Demo/obj/x86/Release/GenerateResource.read.1.tlog