added methods to controller
Merge branch 'master' of https://github.com/salzheimer/Spring2014_CapstoneProject

Conflicts:
	Code/EnvironmentalApp/EnvironmentalApp.Gui/bin/EnvironmentalApp.Gui.dll
	Code/EnvironmentalApp/EnvironmentalApp.Gui/obj/Debug/EnvironmentalApp.Gui.dll