Merge branch 'master' of https://github.com/abeshiv/TeamTenProductions

Conflicts:
	miVacationSurfer/miVacationSurfer/Controllers/SearchController.cs
Merge branch 'master' of https://github.com/ashjslaughter/TeamTenProductions

Conflicts:
	miVacationSurfer/miVacationSurfer/Controllers/SearchController.cs
	miVacationSurfer/miVacationSurfer/Views/Home/Index.cshtml