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

Conflicts:
	WebApplication1/WebApplication1/bin/WebApplication1.dll
	WebApplication1/WebApplication1/bin/WebApplication1.pdb
	WebApplication1/WebApplication1/obj/Debug/WebApplication1.dll
	WebApplication1/WebApplication1/obj/Debug/WebApplication1.pdb

git fix