fixes
Merge branch 'master' of github.com:adlakhavaibhav/HealthKartWeb into sunit
menu clean up
conflict resolved
code