altered Git Ignore
Merge branch 'master' of github.com:owenconnor/Betse

Conflicts:
	Aggregator/bin/Debug/Aggregator.dll
	Aggregator/bin/Debug/Aggregator.dll.config
	Aggregator/bin/Debug/Aggregator.pdb
	Aggregator/obj/Debug/Aggregator.dll
	Aggregator/obj/Debug/Aggregator.pdb
	Aggregator/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Aggregator/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
	Betse/csx/Debug/ServiceDefinition.build.rd
	Betse/csx/Debug/roles/Aggregator/approot/Aggregator.dll
	Betse/csx/Debug/roles/Aggregator/approot/Aggregator.dll.config
	Betse/csx/Debug/roles/Aggregator/approot/Aggregator.pdb
	Betse/csx/Release/ServiceDefinition.build.rd
	Betse/csx/Release/roles/Aggregator/RoleModel.xml
	Betse/csx/Release/roles/Frontend/RoleModel.xml
	Betse/csx/Release/roles/Frontend/approot/Views/Market/Create.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Market/Delete.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Market/Details.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Market/Edit.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Market/Index.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Player/Create.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Player/Delete.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Player/Details.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Player/Edit.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Player/Index.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Strategy/Create.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Strategy/Delete.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Strategy/Details.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Strategy/Edit.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/Strategy/Index.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/User/Create.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/User/Delete.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/User/Details.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/User/Edit.cshtml
	Betse/csx/Release/roles/Frontend/approot/Views/User/Index.cshtml
	Betse/csx/Release/roles/Frontend/approot/Web.config
	Betse/csx/Release/roles/Frontend/approot/bin/Frontend.dll
	Betse/csx/Release/roles/Frontend/approot/bin/Frontend.pdb
	Betse/csx/Release/roles/StrategyEngine/RoleModel.xml
	Betse/csx/Release/roles/StrategyEngine/approot/StrategyEngine.dll
	Betse/csx/Release/roles/StrategyEngine/approot/StrategyEngine.dll.config
	Betse/csx/Release/roles/StrategyEngine/approot/StrategyEngine.pdb
	Betse/obj/Debug/Aggregator/Aggregator.dll
	Betse/obj/Debug/Aggregator/Aggregator.dll.config
	Betse/obj/Debug/Aggregator/Aggregator.pdb
	Betse/obj/Release/Betse.ccproj.FileListAbsolute.txt
	Betse/obj/Release/Frontend/Views/Market/Create.cshtml
	Betse/obj/Release/Frontend/Views/Market/Delete.cshtml
	Betse/obj/Release/Frontend/Views/Market/Details.cshtml
	Betse/obj/Release/Frontend/Views/Market/Edit.cshtml
	Betse/obj/Release/Frontend/Views/Market/Index.cshtml
	Betse/obj/Release/Frontend/Views/Player/Create.cshtml
	Betse/obj/Release/Frontend/Views/Player/Delete.cshtml
	Betse/obj/Release/Frontend/Views/Player/Details.cshtml
	Betse/obj/Release/Frontend/Views/Player/Edit.cshtml
	Betse/obj/Release/Frontend/Views/Player/Index.cshtml
	Betse/obj/Release/Frontend/Views/Strategy/Create.cshtml
	Betse/obj/Release/Frontend/Views/Strategy/Delete.cshtml
	Betse/obj/Release/Frontend/Views/Strategy/Details.cshtml
	Betse/obj/Release/Frontend/Views/Strategy/Edit.cshtml
	Betse/obj/Release/Frontend/Views/Strategy/Index.cshtml
	Betse/obj/Release/Frontend/Views/User/Create.cshtml
	Betse/obj/Release/Frontend/Views/User/Delete.cshtml
	Betse/obj/Release/Frontend/Views/User/Details.cshtml
	Betse/obj/Release/Frontend/Views/User/Edit.cshtml
	Betse/obj/Release/Frontend/Views/User/Index.cshtml
	Betse/obj/Release/Frontend/Web.config
	Betse/obj/Release/Frontend/bin/Frontend.dll
	Betse/obj/Release/Frontend/bin/Frontend.pdb
	Betse/obj/Release/StrategyEngine/StrategyEngine.dll
	Betse/obj/Release/StrategyEngine/StrategyEngine.dll.config
	Betse/obj/Release/StrategyEngine/StrategyEngine.pdb
	Frontend/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
	Frontend/obj/Release/Frontend.dll
	Frontend/obj/Release/Frontend.pdb
	Frontend/obj/Release/TransformWebConfig/original/Web.config
	Frontend/obj/Release/TransformWebConfig/transformed/Web.config