# Conflicts:
#	PhoneStore/Controllers/OrdersController.cs
#	PhoneStore/Controllers/PersonalAreaController.cs
#	PhoneStore/Startup.cs
#	PhoneStore/Views/PersonalArea/Index.cshtml
#	PhoneStore/Views/Shared/_Layout.cshtml
#	PhoneStore/wwwroot/css/site.css