2
Merge branch 'master' of https://github.com/patelsaurabh10/MyNutrition

Conflicts:
	WebApplication1/WebApplication1.v11.suo
	WebApplication1/WebApplication1/App_Code/dlPlan.cs
	WebApplication1/WebApplication1/bin/WebApplication1.dll
	WebApplication1/WebApplication1/bin/WebApplication1.pdb
	WebApplication1/WebApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WebApplication1/WebApplication1/obj/Debug/WebApplication1.csprojResolveAssemblyReference.cache
	WebApplication1/WebApplication1/obj/Debug/WebApplication1.dll
	WebApplication1/WebApplication1/obj/Debug/WebApplication1.pdb
	WebApplication1/WebApplication1/viewProvidedPlans.aspx
	WebApplication1/WebApplication1/viewProvidedPlans.aspx.cs