Clean up Commits
error
erorr
Getting Master
Merge branch 'master' of https://github.com/OITCST326/JuniorProject

Conflicts:
	Current - AIM WCF/AIM/AIM/AIM.Client.Entities/bin/Debug/AIM.Client.Entities.dll
	Current - AIM WCF/AIM/AIM/AIM.Client.Entities/bin/Debug/AIM.Client.Entities.pdb
	Current - AIM WCF/AIM/AIM/AIM.Client.Entities/obj/Debug/AIM.Client.Entities.csproj.FileListAbsolute.txt
	Current - AIM WCF/AIM/AIM/AIM.Client.Entities/obj/Debug/AIM.Client.Entities.csprojResolveAssemblyReference.cache
	Current - AIM WCF/AIM/AIM/AIM.Client.Entities/obj/Debug/AIM.Client.Entities.dll
	Current - AIM WCF/AIM/AIM/AIM.Client.Entities/obj/Debug/AIM.Client.Entities.pdb
	Current - AIM WCF/AIM/AIM/AIM.Client.Entities/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Client.Entities.dll
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Client.Entities.pdb
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.ConsoleClient.exe
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.ConsoleClient.pdb
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Service.Core.dll
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Service.Core.pdb
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Service.Entities.dll
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Service.Entities.pdb
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/obj/Debug/AIM.ConsoleClient.csproj.FileListAbsolute.txt
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/obj/Debug/AIM.ConsoleClient.csprojResolveAssemblyReference.cache
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/obj/Debug/AIM.ConsoleClient.exe
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/obj/Debug/AIM.ConsoleClient.pdb
	Current - AIM WCF/AIM/AIM/AIM.ConsoleClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Current - AIM WCF/AIM/AIM/AIM.Service.Administrative/bin/Debug/AIM.Service.Core.dll
	Current - AIM WCF/AIM/AIM/AIM.Service.Administrative/bin/Debug/AIM.Service.Core.pdb
	Current - AIM WCF/AIM/AIM/AIM.Service.Administrative/bin/Debug/AIM.Service.Entities.dll
	Current - AIM WCF/AIM/AIM/AIM.Service.Administrative/bin/Debug/AIM.Service.Entities.pdb
	Current - AIM WCF/AIM/AIM/AIM.Service.Administrative/obj/Debug/AIM.Service.Administrative.csproj.FileListAbsolute.txt
	Current - AIM WCF/AIM/AIM/AIM.Service.Administrative/obj/Debug/AIM.Service.Administrative.csprojResolveAssemblyReference.cache
	Current - AIM WCF/AIM/AIM/AIM.Service.Administrative/obj/Debug/AIM.Service.Core.dll
	Current - AIM WCF/AIM/AIM/AIM.Service.Administrative/obj/Debug/AIM.Service.Core.pdb
	Current - AIM WCF/AIM/AIM/AIM.Service.Administrative/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Current - AIM WCF/AIM/AIM/AIM.Service.Entities/bin/Debug/AIM.Service.Entities.dll
	Current - AIM WCF/AIM/AIM/AIM.Service.Entities/bin/Debug/AIM.Service.Entities.pdb
	Current - AIM WCF/AIM/AIM/AIM.Service.Entities/obj/Debug/AIM.Service.Entities.dll
	Current - AIM WCF/AIM/AIM/AIM.Service.Entities/obj/Debug/AIM.Service.Entities.pdb
	Current - AIM WCF/AIM/AIM/AIM.Service.Entities/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Service.Entities.dll
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Service.Entities.pdb
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Web.Admin.Tests.dll
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Web.Admin.Tests.pdb
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Web.Admin.dll
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Web.Admin.pdb
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/AIM.Web.Admin.Tests.csproj.FileListAbsolute.txt
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/AIM.Web.Admin.Tests.csprojResolveAssemblyReference.cache
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/AIM.Web.Admin.Tests.dll
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/AIM.Web.Admin.Tests.pdb
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Core.dll
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Core.pdb
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Entities.dll
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Entities.pdb
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/bin/AIM.Web.Admin.dll
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/bin/AIM.Web.Admin.pdb
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/obj/Debug/AIM.Web.Admin.csproj.FileListAbsolute.txt
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/obj/Debug/AIM.Web.Admin.csprojResolveAssemblyReference.cache
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/obj/Debug/AIM.Web.Admin.dll
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/obj/Debug/AIM.Web.Admin.pdb
	Current - AIM WCF/AIM/AIM/AIM.Web.Admin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache