modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Models/HouseDisplayModel.cs
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/House/EnterInfo.cshtml
	new file:   SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/Views/House/EnterInfo.cshtml
	modified:   SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/CustomValidators/CustomValidator.cs
Merge pull request #25 from zyxxy/Trunk

Validators
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/Models/HouseDisplayModel.cs
Merge remote-tracking branch 'upstream/Trunk' into Trunk
	modified:   SdProject/Controllers/HouseController.cs
	new file:   SdProject/CustomValidators/RoomsValidator.cs
	modified:   SdProject/Models/HouseDisplayModel.cs
	deleted:    SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/SdProject.csproj
	deleted:    SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/SdProject.csproj
Merge pull request #27 from zyxxy/Trunk

Validation, zip code and number of rooms.
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/Controllers/HouseController.cs
	SdProject/Models/HouseDisplayModel.cs

	modified:   SdProject/Controllers/HouseController.cs
	new file:   SdProject/CustomValidators/RoomsValidator.cs
	modified:   SdProject/Models/HouseDisplayModel.cs
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/House/EnterInfo.cshtml