Merge pull request #3 from zyxxy/Trunk

Merging changes
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
 modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
Merge pull request #12 from Lsargent/Trunk

Merge pull request #34 from Kholiway/Trunk
4/15
Merge pull request #35 from Kholiway/Trunk

Trunk
Merge pull request #13 from Lsargent/Trunk

Merge pull request #35 from Kholiway/Trunk
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
Merge remote-tracking branch 'upstream/Trunk' into Trunk

Conflicts:
	SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf

	modified:   SdProject/App_Start/BundleConfig.cs
	new file:   SdProject/Content/Pics/pic09.jpg
	new file:   SdProject/Content/Pics/pic10.jpg
	new file:   SdProject/Content/Pics/pic11.jpg
	new file:   SdProject/Content/default.css
	modified:   SdProject/Controllers/HouseController.cs
	new file:   SdProject/Images/pic09.jpg
	new file:   SdProject/Images/pic10.jpg
	new file:   SdProject/Images/pic11.jpg
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	new file:   SdProject/Scripts/SlideFeature.js
	deleted:    SdProject/Scripts/jquery.imagedialog.js
	new file:   SdProject/Scripts/jquery.slidertron-1.1.js
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Home/Index.cshtml
	modified:   SdProject/Views/Shared/_Layout.cshtml
	new file:   SdProject/Views/Test.cshtml
	new file:   SdProject/Views/Test2.cshtml
	modified:   SdProject/Web.config
Merge pull request #4 from zyxxy/master

test
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
Merge remote-tracking branch 'upstream/Trunk'

Conflicts:
	SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf

	modified:   SdProject/App_Start/BundleConfig.cs
	new file:   SdProject/Content/Pics/pic09.jpg
	new file:   SdProject/Content/Pics/pic10.jpg
	new file:   SdProject/Content/Pics/pic11.jpg
	new file:   SdProject/Content/default.css
	modified:   SdProject/Controllers/HouseController.cs
	new file:   SdProject/CustomValidators/FileSizeAttribute.cs
	new file:   SdProject/CustomValidators/FileTypesAttribute.cs
	new file:   SdProject/Images/pic09.jpg
	new file:   SdProject/Images/pic10.jpg
	new file:   SdProject/Images/pic11.jpg
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	new file:   SdProject/Scripts/SlideFeature.js
	new file:   SdProject/Scripts/jquery.slidertron-1.1.js
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Home/Index.cshtml
	new file:   SdProject/Views/House/UploadImage.cshtml
	modified:   SdProject/Views/Shared/_Layout.cshtml
	new file:   SdProject/Views/Test.cshtml
	new file:   SdProject/Views/Test2.cshtml
4/15
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Content/default.css
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Account/Login.cshtml
Merge branch 'Trunk'

Conflicts:
	SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf

	modified:   SdProject/Controllers/HouseController.cs
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	deleted:    SdProject/Scripts/jquery.imagedialog.js
	modified:   SdProject/Web.config
css done
Merge pull request #38 from zyxxy/Trunk

Trunk
Merge branch 'Trunk' of https://github.com/Kholiway/SdProject into Kholiway-Trunk

Conflicts:
	SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	SdProject/Content/default.css
	SdProject/Views/Account/Login.cshtml

  Changes to be committed:

	modified:   SdProject/App_Start/BundleConfig.cs
	modified:   SdProject/Content/Site.css
	modified:   SdProject/Content/default.css
	deleted:    SdProject/Images/accent.png
	deleted:    SdProject/Images/heroAccent.png
	new file:   SdProject/Images/logo.jpg
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Account/Register.cshtml
	modified:   SdProject/Views/Home/About.cshtml
	modified:   SdProject/Views/Home/Index.cshtml
	modified:   SdProject/Views/Shared/_Layout.cshtml
	modified:   SdProject/Views/Shared/_LoginPartial.cshtml
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

 Changes to be committed:

	modified:   SdProject/App_Start/BundleConfig.cs
	new file:   SdProject/Content/Pics/pic09.jpg
	new file:   SdProject/Content/Pics/pic10.jpg
	new file:   SdProject/Content/Pics/pic11.jpg
	modified:   SdProject/Content/Site.css
	new file:   SdProject/Content/default.css
	modified:   SdProject/Controllers/HouseController.cs
	deleted:    SdProject/Images/accent.png
	deleted:    SdProject/Images/heroAccent.png
	new file:   SdProject/Images/logo.jpg
	new file:   SdProject/Images/pic09.jpg
	new file:   SdProject/Images/pic10.jpg
	new file:   SdProject/Images/pic11.jpg
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	new file:   SdProject/Scripts/SlideFeature.js
	deleted:    SdProject/Scripts/jquery.imagedialog.js
	new file:   SdProject/Scripts/jquery.slidertron-1.1.js
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Account/Register.cshtml
	modified:   SdProject/Views/Home/About.cshtml
	modified:   SdProject/Views/Home/Index.cshtml
	modified:   SdProject/Views/Shared/_Layout.cshtml
	modified:   SdProject/Views/Shared/_LoginPartial.cshtml
	new file:   SdProject/Views/Test.cshtml
	new file:   SdProject/Views/Test2.cshtml
	modified:   SdProject/Web.config