auth work
Merge branch 'master' of https://github.com/salzheimer/Spring2014_CapstoneProject

Conflicts:
	Code/EnvironmentalApp/EnvironmentalApp.Core.Tests/obj/Debug/EnvironmentalApp.Core.Tests.dll
	Code/EnvironmentalApp/EnvironmentalApp.Data.Tests/obj/Debug/EnvironmentalApp.Data.Tests.dll
	Code/EnvironmentalApp/EnvironmentalApp.Data/Data.config
	Code/EnvironmentalApp/EnvironmentalApp.Gui/App_Start/RouteConfig.cs
	Code/EnvironmentalApp/EnvironmentalApp.Gui/Controllers/HomeController.cs
	Code/EnvironmentalApp/EnvironmentalApp.Gui/Controllers/ReportController.cs
	Code/EnvironmentalApp/EnvironmentalApp.Gui/EnvironmentalApp.Gui.csproj
	Code/EnvironmentalApp/EnvironmentalApp.Gui/Views/Home/Index2.cshtml
Merge branch 'master' of https://github.com/salzheimer/Spring2014_CapstoneProject

Conflicts:
	Code/EnvironmentalApp/EnvironmentalApp.Core.Tests/obj/Debug/EnvironmentalApp.Core.Tests.dll
	Code/EnvironmentalApp/EnvironmentalApp.Data.Tests/obj/Debug/EnvironmentalApp.Data.Tests.dll