Stuff
Merge branch 'master' of https://github.com/AHABtheARAB7/SeniorDesign

Conflicts:
	SeniorDesignWebApp/SeniorDesignWebApp.v12.suo
	SeniorDesignWebApp/SeniorDesignWebApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache