Don't know what's in here
Merge branch 'master' of https://github.com/jeffersii/SportsStore

Conflicts:
	SportsStore.UnitTests/bin/Debug/SportsStore.UnitTests.dll
	SportsStore.UnitTests/bin/Debug/SportsStore.UnitTests.pdb
	SportsStore.UnitTests/bin/Debug/SportsStore.WebUI.dll
	SportsStore.UnitTests/bin/Debug/SportsStore.WebUI.pdb
	SportsStore.UnitTests/obj/Debug/SportsStore.UnitTests.csprojResolveAssemblyReference.cache
	SportsStore.UnitTests/obj/Debug/SportsStore.UnitTests.dll
	SportsStore.UnitTests/obj/Debug/SportsStore.UnitTests.pdb
	SportsStore.WebUI/App_Start/RouteConfig.cs
	SportsStore.WebUI/bin/SportsStore.WebUI.dll
	SportsStore.WebUI/bin/SportsStore.WebUI.pdb
	SportsStore.WebUI/obj/Debug/SportsStore.WebUI.dll
	SportsStore.WebUI/obj/Debug/SportsStore.WebUI.pdb
Merge branch 'master' of https://github.com/jeffersii/SportsStore

Conflicts:
	SportsStore.sln.DotSettings.user
	SportsStore.v11.suo