Merge pull request #4 from Lsargent/Trunk

Trunk
Merge pull request #8 from Lsargent/Trunk

Trunk
Merge pull request #12 from Lsargent/Trunk

Trunk
got mdf file working
Random controller work

Added string extension class
sync
sync
Merge branch 'Add-Data-Access-and-Domain-Layer' of https://github.com/Barton3200/SdProject into Add-Data-Access-and-Domain-Layer

Conflicts:
	SdProject/Controllers/HouseController.cs
Merge pull request #41 from Kholiway/Trunk

Trunk
Merge pull request #16 from Barton3200/Trunk

Trunk
Added Address views
Create friendship
Merge pull request #42 from Kholiway/Trunk

4/22
Merge branch 'Trunk' of https://github.com/Lsargent/SdProject into Lsargent-Trunk

Conflicts:
	SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	SdProject/Models/HouseModels/HouseDisplayModel.cs
	SdProject/Models/HouseModels/HousePreviewModel.cs

 Changes to be committed:

	new file:   SdProject/App_Data/1.jpeg
	new file:   SdProject/App_Data/2.jpeg
	modified:   SdProject/Content/Site.css
	modified:   SdProject/Controllers/AccountController.cs
	modified:   SdProject/Controllers/HouseController.cs
	modified:   SdProject/Controllers/ImageController.cs
	modified:   SdProject/CustomValidators/FileSizeAttribute.cs
	modified:   SdProject/CustomValidators/FileTypesAttribute.cs
	modified:   SdProject/Models/ImageModels/UploadImage.cs
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Account/PageView.cshtml
	modified:   SdProject/Views/Account/Profile.cshtml
	deleted:    SdProject/Views/House/UploadImage.cshtml
	modified:   SdProject/Views/Image/UploadImage.cshtml
	modified:   SdProject/Views/Shared/_Layout.cshtml
fixed profile view
Merge pull request #44 from Barton3200/Add-Data-Access-and-Domain-Layer

Add data access and domain layer
Merge pull request #15 from Lsargent/Trunk

Trunk