korzina, ne zakonchena
korzina pochti gotova
Merge branch 'S2-Buy' of https://github.com/sergeysah/Netping_modern into sergeysah-S2-Buy

Conflicts:
	NetPing_modern.v11.suo
	NetPing_modern/Views/Catalog/Index.cshtml
	NetPing_modern/Views/Product_item/Index.cshtml
	NetPing_modern/Views/Shared/Header.cshtml
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NetPing_modern/obj/Debug/NetPing_modern.dll
	NetPing_modern/obj/Debug/NetPing_modern.pdb
Merge branch 'sergeysah-S2-Buy' into S2-Buy
fix price
Merge remote-tracking branch 'origin/master' into S2-Buy

Conflicts:
	NetPing_modern.v12.suo
	NetPing_modern/Views/Catalog/Index.cshtml
	NetPing_modern/Views/Shared/Header.cshtml
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NetPing_modern/obj/Debug/NetPing_modern.dll
	NetPing_modern/obj/Debug/NetPing_modern.pdb
	NetPing_modern/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
	NetPing_modern/obj/Release/NetPing_modern.csproj.GenerateResource.Cache
	NetPing_modern/obj/Release/NetPing_modern.dll
	NetPing_modern/obj/Release/NetPing_modern.pdb
change
Added email send with cart info
Merge pull request #32 from chipsergik/S2-Buy

Added email send with cart info
Corrections on product cart behaviour
Merge pull request #33 from chipsergik/S2-Buy

Corrections on product cart behaviour
Fixed cart counter bug
Merge pull request #34 from chipsergik/S2-Buy

Fixed cart counter bug
Merge remote-tracking branch 'origin/S2-Buy'

Conflicts:
	NetPing_modern.v12.suo
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NetPing_modern/obj/Debug/NetPing_modern.dll
	NetPing_modern/obj/Debug/NetPing_modern.pdb
	NetPing_modern/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
	NetPing_modern/obj/Release/NetPing_modern.csproj.FileListAbsolute.txt
	NetPing_modern/obj/Release/NetPing_modern.csproj.GenerateResource.Cache
	NetPing_modern/obj/Release/NetPing_modern.dll
	NetPing_modern/obj/Release/NetPing_modern.pdb