$(data)
s
d
news :)
trying to turn connection string :(
ahmed add
add2 marwan
Merge branch 'origin/Marwan'

Conflicts:
	am I there on PC.txt
Merge branch 'origin/Marwan'

Conflicts:
	am I there on PC.txt
ahmed change
marwan change
marwan change
Merge branch 'master'
ddddd
ddddd
the final result of merging
marwan change
sasasass
final result
final result
Merge branch 'origin/MarwanMVCproject'

Conflicts:
	MvcApplication2.v11.suo
	MvcApplication2/Controllers/AdminController.cs
	MvcApplication2/Controllers/HomeController.cs
	MvcApplication2/Models/Model1.Context.cs
	MvcApplication2/Models/Model1.Designer.cs
	MvcApplication2/Models/Model1.edmx
	MvcApplication2/Models/Model1.edmx.diagram
	MvcApplication2/Models/News.cs
	MvcApplication2/MvcApplication2.csproj
	MvcApplication2/Views/Admin/Projects.cshtml
	MvcApplication2/Views/Home/News.cshtml
	MvcApplication2/Views/Shared/_AdminLayout.cshtml
	MvcApplication2/Web.config
	MvcApplication2/bin/MvcApplication2.dll
	MvcApplication2/bin/MvcApplication2.pdb
	MvcApplication2/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	MvcApplication2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MvcApplication2/obj/Debug/MvcApplication2.csproj.FileListAbsolute.txt
	MvcApplication2/obj/Debug/MvcApplication2.csprojResolveAssemblyReference.cache
	MvcApplication2/obj/Debug/MvcApplication2.dll
	MvcApplication2/obj/Debug/MvcApplication2.pdb
	MvcApplication2/obj/Debug/TempPE/Models.Model1.Designer.cs.dll
	MvcApplication2/obj/Debug/TempPE/Models.Model1.cs.dll
	MvcApplication2/obj/Debug/edmxResourcesToEmbed/Models/Model1.csdl
	MvcApplication2/obj/Debug/edmxResourcesToEmbed/Models/Model1.msl
	MvcApplication2/obj/Debug/edmxResourcesToEmbed/Models/Model1.ssdl