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

Conflicts:
	WebApplication1/WebApplication1.v11.suo

fix git